[valadoc] Api: Remove Basic and DocumentedElement
- From: Florian Brosch <flobrosch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [valadoc] Api: Remove Basic and DocumentedElement
- Date: Thu, 15 Oct 2009 21:04:25 +0000 (UTC)
commit 5e9e0ccc2055db3bced0c14b717233957426b97b
Author: Didier 'Ptitjes <ptitjes free fr>
Date: Thu Oct 15 14:05:44 2009 +0200
Api: Remove Basic and DocumentedElement
src/doclets/devhelp/doclet/doclet.vala | 22 ++--
src/doclets/htm/doclet/doclet.vala | 20 ++--
src/doclets/htmlhelpers/doclet/doclet.vala | 166 ++++++++++----------
src/doclets/htmlhelpers/doclet/globals.vala | 12 +-
src/doclets/htmlhelpers/doclet/htmlrenderer.vala | 16 +-
src/doclets/htmlhelpers/doclet/langlet.vala | 36 ++--
src/doclets/valadoc.org/doclet/doclet.vala | 18 +-
.../valadoc.org/html-apiwriter/apiwriter-vala.vala | 32 ++--
.../valadoc.org/html-apiwriter/apiwriter.vala | 2 +-
src/doclets/valadoc.org/taglets/image.vala | 4 +-
src/doclets/valadoc.org/taglets/parameter.vala | 2 +-
src/doclets/valadoc.org/taglets/return.vala | 2 +-
src/doclets/valadoc.org/taglets/see.vala | 4 +-
src/doclets/valadoc.org/taglets/since.vala | 2 +-
src/doclets/valadoc.org/taglets/throws.vala | 4 +-
src/doclets/valadoc.org/taglets/typelink.vala | 2 +-
src/libvaladoc/Makefile.am | 2 -
src/libvaladoc/apitree/apinode.vala | 71 ++++++++-
src/libvaladoc/apitree/apitree.vala | 8 +-
src/libvaladoc/apitree/array.vala | 6 +-
src/libvaladoc/apitree/basic.vala | 27 ---
src/libvaladoc/apitree/class.vala | 2 +-
src/libvaladoc/apitree/documentedelement.vala | 105 ------------
src/libvaladoc/apitree/exceptionlisthandler.vala | 2 +-
src/libvaladoc/apitree/interface.vala | 2 +-
src/libvaladoc/apitree/method.vala | 4 +-
src/libvaladoc/apitree/pointer.vala | 8 +-
src/libvaladoc/apitree/returntypehandler.vala | 2 +-
src/libvaladoc/apitree/typereference.vala | 4 +-
src/libvaladoc/content/blockcontent.vala | 2 +-
src/libvaladoc/content/comment.vala | 4 +-
src/libvaladoc/content/contentelement.vala | 2 +-
src/libvaladoc/content/embedded.vala | 2 +-
src/libvaladoc/content/headline.vala | 2 +-
src/libvaladoc/content/highlighted.vala | 2 +-
src/libvaladoc/content/inlinecontent.vala | 2 +-
src/libvaladoc/content/inlinetaglet.vala | 2 +-
src/libvaladoc/content/link.vala | 2 +-
src/libvaladoc/content/list.vala | 2 +-
src/libvaladoc/content/listitem.vala | 2 +-
src/libvaladoc/content/paragraph.vala | 2 +-
src/libvaladoc/content/sourcecode.vala | 2 +-
src/libvaladoc/content/symbollink.vala | 6 +-
src/libvaladoc/content/table.vala | 2 +-
src/libvaladoc/content/tablecell.vala | 2 +-
src/libvaladoc/content/tablerow.vala | 2 +-
src/libvaladoc/content/text.vala | 2 +-
.../documentation/documentationparser.vala | 2 +-
src/libvaladoc/drawer.vala | 2 +-
src/libvaladoc/langlet.vala | 6 +-
src/libvaladoc/taglets/tagletdeprecated.vala | 2 +-
src/libvaladoc/taglets/tagletinheritdoc.vala | 4 +-
src/libvaladoc/taglets/tagletlink.vala | 4 +-
src/libvaladoc/taglets/tagletparam.vala | 2 +-
src/libvaladoc/taglets/tagletreturn.vala | 2 +-
src/libvaladoc/taglets/tagletsee.vala | 4 +-
src/libvaladoc/taglets/tagletsince.vala | 2 +-
src/libvaladoc/taglets/tagletthrows.vala | 4 +-
58 files changed, 294 insertions(+), 369 deletions(-)
---
diff --git a/src/doclets/devhelp/doclet/doclet.vala b/src/doclets/devhelp/doclet/doclet.vala
index 21c5eb3..c13de8d 100755
--- a/src/doclets/devhelp/doclet/doclet.vala
+++ b/src/doclets/devhelp/doclet/doclet.vala
@@ -32,8 +32,8 @@ namespace Valadoc.Devhelp {
}
}
- if ( element is DocumentedElement ) {
- if ( ((DocumentedElement)element).package.is_visitor_accessible (settings) == false ) {
+ if ( element is Api.Node ) {
+ if ( ((Api.Node)element).package.is_visitor_accessible (settings) == false ) {
return null;
}
}
@@ -42,8 +42,8 @@ namespace Valadoc.Devhelp {
if ( element is Package ) {
return Path.build_filename(((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename("..", ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename("..", ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
if ( pos == element ) {
@@ -57,12 +57,12 @@ namespace Valadoc.Devhelp {
}
}
}
- else if ( pos is DocumentedElement ) {
+ else if ( pos is Api.Node ) {
if ( element is Package ) {
return Path.build_filename("..", ((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename( "..", ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename( "..", ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
string wikiname = ((WikiPage)element).name;
@@ -80,8 +80,8 @@ namespace Valadoc.Devhelp {
if ( element is Package ) {
return Path.build_filename("..", ((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename( "..", ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename( "..", ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
string wikiname = ((WikiPage)element).name;
@@ -204,11 +204,11 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
private DevhelpFormat devhelp;
private Tree tree;
- private string get_path ( DocumentedElement element ) {
+ private string get_path ( Api.Node element ) {
return element.full_name () + ".html";
}
- private string get_real_path ( DocumentedElement element ) {
+ private string get_real_path ( Api.Node element ) {
return GLib.Path.build_filename ( this.settings.path, this.package_dir_name, element.full_name () + ".html" );
}
diff --git a/src/doclets/htm/doclet/doclet.vala b/src/doclets/htm/doclet/doclet.vala
index 4ff5cff..dc64f09 100755
--- a/src/doclets/htm/doclet/doclet.vala
+++ b/src/doclets/htm/doclet/doclet.vala
@@ -31,8 +31,8 @@ namespace Valadoc {
}
}
- if ( element is DocumentedElement ) {
- if (! ((DocumentedElement) element).package.is_visitor_accessible (settings)) {
+ if ( element is Api.Node ) {
+ if (! ((Api.Node) element).package.is_visitor_accessible (settings)) {
return null;
}
}
@@ -41,8 +41,8 @@ namespace Valadoc {
if ( element is Package ) {
return Path.build_filename(((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename( ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename( ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
if ( pos == element ) {
@@ -56,12 +56,12 @@ namespace Valadoc {
}
}
}
- else if ( pos is DocumentedElement ) {
+ else if ( pos is Api.Node ) {
if ( element is Package ) {
return Path.build_filename("..", ((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename( "..", ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename( "..", ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
string wikiname = ((WikiPage)element).name;
@@ -79,8 +79,8 @@ namespace Valadoc {
if ( element is Package ) {
return Path.build_filename("..", ((Package)element).name, "index.htm");
}
- else if ( element is DocumentedElement ) {
- return Path.build_filename( "..", ((DocumentedElement)element).package.name, ((DocumentedElement)element).full_name()+".html" );
+ else if ( element is Api.Node ) {
+ return Path.build_filename( "..", ((Api.Node)element).package.name, ((Api.Node)element).full_name()+".html" );
}
else if ( element is WikiPage ) {
string wikiname = ((WikiPage)element).name;
@@ -105,7 +105,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
private const string css_path_wiki = "../style.css";
private const string css_path = "../style.css";
- private string get_real_path ( DocumentedElement element ) {
+ private string get_real_path ( Api.Node element ) {
return GLib.Path.build_filename ( this.settings.path, element.package.name, element.full_name () + ".html" );
}
diff --git a/src/doclets/htmlhelpers/doclet/doclet.vala b/src/doclets/htmlhelpers/doclet/doclet.vala
index 12d56b4..7523bed 100755
--- a/src/doclets/htmlhelpers/doclet/doclet.vala
+++ b/src/doclets/htmlhelpers/doclet/doclet.vala
@@ -30,7 +30,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
_renderer = new HtmlRenderer (this);
}
- protected string? get_link ( DocumentedElement element, DocumentedElement? pos ) {
+ protected string? get_link ( Api.Node element, Api.Node? pos ) {
return get_html_link ( this.settings, element, pos );
}
@@ -42,7 +42,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", style, css_navi_link, link, content );
}
- protected void write_navi_entry ( GLib.FileStream file, DocumentedElement element, DocumentedElement? pos, string style, bool link, bool full_name = false ) {
+ protected void write_navi_entry ( GLib.FileStream file, Api.Node element, Api.Node? pos, string style, bool link, bool full_name = false ) {
string name;
if ( element is Class ) {
@@ -99,7 +99,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_top_entry ( GLib.FileStream file, DocumentedElement element, DocumentedElement? mself ) {
+ protected void write_navi_top_entry ( GLib.FileStream file, Api.Node element, Api.Node? mself ) {
string name = (element.name == null)? "Global Namespace" : element.name;
string style = null;
@@ -135,19 +135,19 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.printf ( "<ul class=\"%s\">\n\t\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">Packages</a></li>\n</ul>\n<hr class=\"%s\">\n", css_navi, css_navi_package_index, css_navi_link, link, css_navi_hr );
}
- protected void write_top_elements ( GLib.FileStream file, DocumentedElement element, DocumentedElement? mself ) {
- Gee.ArrayList<DocumentedElement> lst = new Gee.ArrayList<DocumentedElement> ();
- DocumentedElement pos = element;
+ protected void write_top_elements ( GLib.FileStream file, Api.Node element, Api.Node? mself ) {
+ Gee.ArrayList<Api.Node> lst = new Gee.ArrayList<Api.Node> ();
+ Api.Node pos = element;
this.write_top_element_template ( file, "../index.html" );
while ( pos != null ) {
lst.add ( pos );
- pos = (DocumentedElement)pos.parent;
+ pos = (Api.Node)pos.parent;
}
for ( int i = lst.size-1; i >= 0 ; i-- ) {
- DocumentedElement el = lst.get ( i );
+ Api.Node el = lst.get ( i );
if ( el.name != null ) {
this.write_navi_top_entry ( file, el, mself );
@@ -164,7 +164,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_file ( GLib.FileStream file, Package efile, DocumentedElement? pos ) {
+ protected void write_navi_file ( GLib.FileStream file, Package efile, Api.Node? pos ) {
Gee.ArrayList<Namespace> ns_list = new Gee.ArrayList<Namespace> ();
this.fetch_subnamespace_names (efile, ns_list );
@@ -177,7 +177,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
else if ( pos == efile )
this.write_top_elements ( file, efile, efile );
else
- this.write_top_elements ( file, (DocumentedElement)pos.parent.parent, pos );
+ this.write_top_elements ( file, (Api.Node)pos.parent.parent, pos );
file.printf ( "\t\t\t\t<ul class=\"%s\">\n", css_navi );
@@ -199,7 +199,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_child_namespaces_inline_withouth_block ( GLib.FileStream file, Namespace ns, DocumentedElement? mself ) {
+ protected void write_navi_child_namespaces_inline_withouth_block ( GLib.FileStream file, Namespace ns, Api.Node? mself ) {
this.write_navi_child_namespaces_without_childs ( file, ns, mself );
this.write_navi_child_classes_without_childs ( file, ns, mself );
this.write_navi_child_interfaces_without_childs ( file, ns, mself );
@@ -213,7 +213,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
this.write_navi_child_constants ( file, ns, mself );
}
- protected void write_navi_child_namespaces_inline ( GLib.FileStream file, Namespace ns, DocumentedElement? mself ) {
+ protected void write_navi_child_namespaces_inline ( GLib.FileStream file, Namespace ns, Api.Node? mself ) {
file.printf ( "<ul class=\"%s\">\n", css_navi );
if ( ns.name == null ) {
@@ -225,12 +225,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_navi_child_namespaces ( GLib.FileStream file, Namespace ns, DocumentedElement? mself ) {
+ protected void write_navi_child_namespaces ( GLib.FileStream file, Namespace ns, Api.Node? mself ) {
this.write_top_elements ( file, ns, mself );
this.write_navi_child_namespaces_inline ( file, ns, mself );
}
- protected void write_navi_struct_inline ( GLib.FileStream file, Struct stru, DocumentedElement? mself ) {
+ protected void write_navi_struct_inline ( GLib.FileStream file, Struct stru, Api.Node? mself ) {
file.printf ( "<ul class=\"%s\">\n", css_navi );
this.write_navi_child_construction_methods ( file, stru, mself );
this.write_navi_child_static_methods ( file, stru, mself );
@@ -240,14 +240,14 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_navi_struct ( GLib.FileStream file, Struct stru, DocumentedElement? mself ) {
+ protected void write_navi_struct ( GLib.FileStream file, Struct stru, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, stru, mself );
this.write_navi_struct_inline ( file, stru, mself );
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_interface_inline ( GLib.FileStream file, Interface iface, DocumentedElement? mself ) {
+ protected void write_navi_interface_inline ( GLib.FileStream file, Interface iface, Api.Node? mself ) {
file.printf ( "<ul class=\"%s\">\n", css_navi );
this.write_navi_child_static_methods ( file, iface, mself );
this.write_navi_child_delegates ( file, iface, mself );
@@ -259,14 +259,14 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_navi_interface ( GLib.FileStream file, Interface iface, DocumentedElement? mself ) {
+ protected void write_navi_interface ( GLib.FileStream file, Interface iface, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, iface, mself );
this.write_navi_interface_inline ( file, iface, mself );
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_enum_inline ( GLib.FileStream file, Enum en, DocumentedElement? mself ) {
+ protected void write_navi_enum_inline ( GLib.FileStream file, Enum en, Api.Node? mself ) {
Gee.Collection<EnumValue> enum_values = en.get_enum_values ( );
file.printf ( "<ul class=\"%s\">\n", css_navi );
@@ -279,14 +279,14 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_navi_enum ( GLib.FileStream file, Enum en, DocumentedElement? mself ) {
+ protected void write_navi_enum ( GLib.FileStream file, Enum en, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, en, mself );
this.write_navi_enum_inline ( file, en, mself );
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_error_domain_inline ( GLib.FileStream file, ErrorDomain errdom, DocumentedElement? mself = null ) {
+ protected void write_navi_error_domain_inline ( GLib.FileStream file, ErrorDomain errdom, Api.Node? mself = null ) {
Gee.Collection<ErrorCode> error_codes = errdom.get_error_code_list ( );
file.printf ( "<ul class=\"%s\">\n", css_navi );
@@ -306,14 +306,14 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_error_domain ( GLib.FileStream file, ErrorDomain errdom, DocumentedElement? mself ) {
+ protected void write_navi_error_domain ( GLib.FileStream file, ErrorDomain errdom, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, errdom, mself );
this.write_navi_error_domain_inline ( file, errdom, mself );
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_navi_class_inline ( GLib.FileStream file, Class cl, DocumentedElement? mself ) {
+ protected void write_navi_class_inline ( GLib.FileStream file, Class cl, Api.Node? mself ) {
file.printf ( "<ul class=\"%s\">\n", css_navi );
this.write_navi_child_construction_methods ( file, cl, mself );
this.write_navi_child_static_methods ( file, cl, mself );
@@ -329,7 +329,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_navi_class ( GLib.FileStream file, Class cl, DocumentedElement? mself ) {
+ protected void write_navi_class ( GLib.FileStream file, Class cl, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, cl, mself );
this.write_navi_class_inline ( file, cl, mself );
@@ -337,7 +337,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_method ( GLib.FileStream file, Method m ) {
- DocumentedElement parent = (DocumentedElement)m.parent;
+ Api.Node parent = (Api.Node)m.parent;
if ( parent.name == null ) {
this.write_navi_file ( file, (Package)parent.parent, m );
@@ -365,7 +365,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_property ( GLib.FileStream file, Property prop ) {
- DocumentedElement parent = (DocumentedElement)prop.parent;
+ Api.Node parent = (Api.Node)prop.parent;
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
this.write_top_elements ( file, parent, prop );
@@ -379,7 +379,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_signal ( GLib.FileStream file, Signal sig ) {
- DocumentedElement parent = (DocumentedElement)sig.parent;
+ Api.Node parent = (Api.Node)sig.parent;
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_navigation );
@@ -394,7 +394,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_constant ( GLib.FileStream file, Constant c ) {
- DocumentedElement parent = (DocumentedElement)c.parent;
+ Api.Node parent = (Api.Node)c.parent;
if ( parent.name == null ) {
this.write_navi_file ( file, (Package)parent.parent, c );
@@ -417,7 +417,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_field ( GLib.FileStream file, Field f ) {
- DocumentedElement parent = (DocumentedElement)f.parent;
+ Api.Node parent = (Api.Node)f.parent;
if ( parent.name == null ) {
this.write_navi_file ( file, (Package)parent.parent, f );
@@ -440,7 +440,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
protected void write_navi_delegate ( GLib.FileStream file, Delegate del ) {
- DocumentedElement parent = (DocumentedElement)del.parent;
+ Api.Node parent = (Api.Node)del.parent;
if ( parent.name == null ) {
this.write_navi_file ( file, (Package)parent.parent, del );
@@ -460,7 +460,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, DocumentedElement? mself ) {
+ protected void write_navi_child_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Api.Node? mself ) {
foreach ( Method m in methods ) {
if ( !m.is_static ) {
string css;
@@ -479,7 +479,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_construction_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, DocumentedElement? mself ) {
+ protected void write_navi_child_construction_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Api.Node? mself ) {
foreach ( Method m in methods ) {
if ( m == mself )
this.write_navi_entry ( file, m, mself, css_navi_construction_method, false );
@@ -488,7 +488,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_static_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, DocumentedElement? mself ) {
+ protected void write_navi_child_static_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Api.Node? mself ) {
foreach ( Method m in methods ) {
if ( m.is_static ) {
if ( m == mself )
@@ -499,17 +499,17 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_methods ( GLib.FileStream file, MethodHandler mh, DocumentedElement? mself ) {
+ protected void write_navi_child_methods ( GLib.FileStream file, MethodHandler mh, Api.Node? mself ) {
Gee.Collection<Method> methods = mh.get_method_list ( );
this.write_navi_child_methods_collection ( file, methods, mself );
}
- protected void write_navi_child_static_methods ( GLib.FileStream file, MethodHandler mh, DocumentedElement? mself ) {
+ protected void write_navi_child_static_methods ( GLib.FileStream file, MethodHandler mh, Api.Node? mself ) {
Gee.Collection<Method> methods = mh.get_method_list ( );
this.write_navi_child_static_methods_collection ( file, methods, mself );
}
- protected void write_navi_child_classes_without_childs_collection ( GLib.FileStream file, Gee.Collection<Class> classes, DocumentedElement? mself ) {
+ protected void write_navi_child_classes_without_childs_collection ( GLib.FileStream file, Gee.Collection<Class> classes, Api.Node? mself ) {
foreach ( Class cl in classes ) {
if ( cl == mself )
this.write_navi_entry ( file, cl, mself, (cl.is_abstract)? css_navi_abstract_class : css_navi_class, false );
@@ -518,17 +518,17 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_classes_without_childs ( GLib.FileStream file, ClassHandler clh, DocumentedElement? mself ) {
+ protected void write_navi_child_classes_without_childs ( GLib.FileStream file, ClassHandler clh, Api.Node? mself ) {
Gee.Collection<Class> classes = clh.get_class_list ( );
this.write_navi_child_classes_without_childs_collection ( file, classes, mself );
}
- protected void write_navi_child_construction_methods ( GLib.FileStream file, ConstructionMethodHandler cmh, DocumentedElement? mself ) {
+ protected void write_navi_child_construction_methods ( GLib.FileStream file, ConstructionMethodHandler cmh, Api.Node? mself ) {
Gee.Collection<Method> methods = cmh.get_construction_method_list ( );
this.write_navi_child_construction_methods_collection ( file, methods, mself );
}
- protected void write_navi_child_signals ( GLib.FileStream file, SignalHandler sh, DocumentedElement? mself ) {
+ protected void write_navi_child_signals ( GLib.FileStream file, SignalHandler sh, Api.Node? mself ) {
Gee.Collection<Signal> signals = sh.get_signal_list ( );
foreach ( Signal sig in signals ) {
@@ -539,7 +539,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_properties ( GLib.FileStream file, PropertyHandler ph, DocumentedElement? mself ) {
+ protected void write_navi_child_properties ( GLib.FileStream file, PropertyHandler ph, Api.Node? mself ) {
Gee.Collection<Property> properties = ph.get_property_list ( );
foreach ( Property p in properties ) {
@@ -558,7 +558,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_fields_collection ( GLib.FileStream file, Gee.Collection<Field> fields, DocumentedElement? mself ) {
+ protected void write_navi_child_fields_collection ( GLib.FileStream file, Gee.Collection<Field> fields, Api.Node? mself ) {
foreach ( Field f in fields ) {
if ( f == mself )
this.write_navi_entry ( file, f, mself, css_navi_field, false );
@@ -567,12 +567,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_fields ( GLib.FileStream file, FieldHandler fh, DocumentedElement? mself ) {
+ protected void write_navi_child_fields ( GLib.FileStream file, FieldHandler fh, Api.Node? mself ) {
Gee.Collection<Field> fields = fh.get_field_list ( );
this.write_navi_child_fields_collection ( file, fields, mself );
}
- protected void write_navi_child_constants_collection ( GLib.FileStream file, Gee.Collection<Constant> constants, DocumentedElement? mself ) {
+ protected void write_navi_child_constants_collection ( GLib.FileStream file, Gee.Collection<Constant> constants, Api.Node? mself ) {
foreach ( Constant c in constants ) {
if ( c == mself )
this.write_navi_entry ( file, c, mself, css_navi_constant, false );
@@ -581,12 +581,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_constants ( GLib.FileStream file, ConstantHandler ch, DocumentedElement? mself ) {
+ protected void write_navi_child_constants ( GLib.FileStream file, ConstantHandler ch, Api.Node? mself ) {
Gee.Collection<Constant> constants = ch.get_constant_list ( );
this.write_navi_child_constants_collection ( file, constants, mself );
}
- protected void write_navi_child_structs_without_childs_collection ( GLib.FileStream file, Gee.Collection<Struct> structs, DocumentedElement? mself ) {
+ protected void write_navi_child_structs_without_childs_collection ( GLib.FileStream file, Gee.Collection<Struct> structs, Api.Node? mself ) {
foreach ( Struct stru in structs ) {
if ( stru == mself )
this.write_navi_entry ( file, stru, mself, css_navi_struct, false );
@@ -595,12 +595,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_structs_without_childs ( GLib.FileStream file, StructHandler strh, DocumentedElement? mself ) {
+ protected void write_navi_child_structs_without_childs ( GLib.FileStream file, StructHandler strh, Api.Node? mself ) {
Gee.Collection<Struct> structs = strh.get_struct_list ( );
this.write_navi_child_structs_without_childs_collection ( file, structs, mself );
}
- protected void write_navi_child_delegates_collection ( GLib.FileStream file, Gee.Collection<Delegate> delegates, DocumentedElement? mself ) {
+ protected void write_navi_child_delegates_collection ( GLib.FileStream file, Gee.Collection<Delegate> delegates, Api.Node? mself ) {
foreach ( Delegate del in delegates ) {
if ( del == mself )
this.write_navi_entry ( file, del, mself, css_navi_del, false );
@@ -609,12 +609,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_delegates ( GLib.FileStream file, DelegateHandler delh, DocumentedElement? mself ) {
+ protected void write_navi_child_delegates ( GLib.FileStream file, DelegateHandler delh, Api.Node? mself ) {
Gee.Collection<Delegate> delegates = delh.get_delegate_list ( );
this.write_navi_child_delegates_collection ( file, delegates, mself );
}
- protected void write_navi_child_interfaces_without_childs_collection ( GLib.FileStream file, Gee.Collection<Interface> interfaces, DocumentedElement? mself ) {
+ protected void write_navi_child_interfaces_without_childs_collection ( GLib.FileStream file, Gee.Collection<Interface> interfaces, Api.Node? mself ) {
foreach ( Interface iface in interfaces ) {
if ( iface == mself )
this.write_navi_entry ( file, iface, mself, css_navi_iface, false );
@@ -623,12 +623,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_interfaces_without_childs ( GLib.FileStream file, Namespace ifh, DocumentedElement? mself ) {
+ protected void write_navi_child_interfaces_without_childs ( GLib.FileStream file, Namespace ifh, Api.Node? mself ) {
Gee.Collection<Interface> interfaces = ifh.get_interface_list ( );
this.write_navi_child_interfaces_without_childs_collection ( file, interfaces, mself );
}
- protected void write_navi_child_enums_without_childs_collection ( GLib.FileStream file, Gee.Collection<Enum> enums, DocumentedElement? mself ) {
+ protected void write_navi_child_enums_without_childs_collection ( GLib.FileStream file, Gee.Collection<Enum> enums, Api.Node? mself ) {
foreach ( Enum en in enums ) {
if ( en == mself )
this.write_navi_entry ( file, en, mself, css_navi_enum, false );
@@ -637,12 +637,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_enums_without_childs ( GLib.FileStream file, EnumHandler eh, DocumentedElement? mself ) {
+ protected void write_navi_child_enums_without_childs ( GLib.FileStream file, EnumHandler eh, Api.Node? mself ) {
Gee.Collection<Enum> enums = eh.get_enum_list ( );
this.write_navi_child_enums_without_childs_collection ( file, enums, mself );
}
- protected void write_navi_child_error_domains_without_childs_collection ( GLib.FileStream file, Gee.Collection<ErrorDomain> errordomains, DocumentedElement? mself ) {
+ protected void write_navi_child_error_domains_without_childs_collection ( GLib.FileStream file, Gee.Collection<ErrorDomain> errordomains, Api.Node? mself ) {
foreach ( ErrorDomain errdom in errordomains ) {
if ( errdom == mself )
this.write_navi_entry ( file, errdom, mself, css_navi_error_domain, false );
@@ -651,12 +651,12 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_navi_child_error_domains_without_childs ( GLib.FileStream file, Namespace errdomh, DocumentedElement? mself ) {
+ protected void write_navi_child_error_domains_without_childs ( GLib.FileStream file, Namespace errdomh, Api.Node? mself ) {
Gee.Collection<ErrorDomain> errordomains = errdomh.get_error_domain_list ( );
this.write_navi_child_error_domains_without_childs_collection ( file, errordomains, mself );
}
- protected void write_navi_child_namespaces_without_childs ( GLib.FileStream file, NamespaceHandler nsh, DocumentedElement? mself ) {
+ protected void write_navi_child_namespaces_without_childs ( GLib.FileStream file, NamespaceHandler nsh, Api.Node? mself ) {
Gee.Collection<Namespace> namespaces = nsh.get_namespace_list ( );
foreach ( Namespace ns in namespaces ) {
if ( ns.name == null )
@@ -669,7 +669,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_package_note ( GLib.FileStream file, DocumentedElement element ) {
+ protected void write_package_note ( GLib.FileStream file, Api.Node element ) {
string package = element.package.name;
if ( package == null )
return ;
@@ -677,7 +677,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.printf ( "\n\n<br />\n<b>Package:</b> %s\n\n", package );
}
- protected void write_namespace_note ( GLib.FileStream file, DocumentedElement element ) {
+ protected void write_namespace_note ( GLib.FileStream file, Api.Node element ) {
Namespace? ns = element.nspace;
if ( ns == null )
return ;
@@ -688,7 +688,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.printf ( "\n\n<br />\n<b>Namespace:</b> %s\n\n", ns.full_name() );
}
- private void write_brief_description ( GLib.FileStream file, DocumentedElement element , DocumentedElement? pos ) {
+ private void write_brief_description ( GLib.FileStream file, Api.Node element , Api.Node? pos ) {
Comment? doctree = element.documentation;
if ( doctree == null )
return ;
@@ -705,7 +705,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- private void write_documentation ( GLib.FileStream file, DocumentedElement element , DocumentedElement? pos ) {
+ private void write_documentation ( GLib.FileStream file, Api.Node element , Api.Node? pos ) {
Comment? doctree = element.documentation;
if ( doctree == null )
return ;
@@ -885,7 +885,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- public void write_enum_content ( GLib.FileStream file, Enum en, DocumentedElement? mself ) {
+ public void write_enum_content ( GLib.FileStream file, Enum en, Api.Node? mself ) {
string full_name = en.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -926,7 +926,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_namespaces ( GLib.FileStream file, NamespaceHandler nh, DocumentedElement? mself ) {
+ protected void write_child_namespaces ( GLib.FileStream file, NamespaceHandler nh, Api.Node? mself ) {
Gee.ArrayList<Namespace> nsl = new Gee.ArrayList<Namespace> ();
this.fetch_subnamespace_names ( nh, nsl );
@@ -963,7 +963,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_child_methods ( GLib.FileStream file, MethodHandler mh, DocumentedElement? mself ) {
+ protected void write_child_methods ( GLib.FileStream file, MethodHandler mh, Api.Node? mself ) {
Gee.Collection<Method> methods = mh.get_method_list ();
Gee.ArrayList<Method> imethods = new Gee.ArrayList<Method> ( );
foreach ( Method m in methods ) {
@@ -983,7 +983,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_dependencies ( GLib.FileStream file, Package package, DocumentedElement? mself ) {
+ protected void write_child_dependencies ( GLib.FileStream file, Package package, Api.Node? mself ) {
Gee.Collection<Package> deps = package.get_full_dependency_list ();
if ( deps.size == 0 )
return ;
@@ -1000,7 +1000,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "</ul>\n" );
}
- protected void write_child_static_methods ( GLib.FileStream file, MethodHandler mh, DocumentedElement? mself ) {
+ protected void write_child_static_methods ( GLib.FileStream file, MethodHandler mh, Api.Node? mself ) {
Gee.Collection<Method> methods = mh.get_method_list ();
Gee.ArrayList<Method> static_methods = new Gee.ArrayList<Method> ( );
@@ -1021,7 +1021,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- public void write_class_content ( GLib.FileStream file, Class cl, DocumentedElement? mself ) {
+ public void write_class_content ( GLib.FileStream file, Class cl, Api.Node? mself ) {
string full_name = cl.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -1054,7 +1054,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- public void write_interface_content ( GLib.FileStream file, Interface iface, DocumentedElement? mself ) {
+ public void write_interface_content ( GLib.FileStream file, Interface iface, Api.Node? mself ) {
string full_name = iface.full_name ();
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -1085,7 +1085,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- public void write_error_domain_content ( GLib.FileStream file, ErrorDomain errdom, DocumentedElement? mself ) {
+ public void write_error_domain_content ( GLib.FileStream file, ErrorDomain errdom, Api.Node? mself ) {
string full_name = errdom.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -1106,7 +1106,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- public void write_struct_content ( GLib.FileStream file, Struct stru, DocumentedElement? mself ) {
+ public void write_struct_content ( GLib.FileStream file, Struct stru, Api.Node? mself ) {
string full_name = stru.full_name ( );
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, full_name );
@@ -1134,15 +1134,15 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- protected string get_img_path ( DocumentedElement element ) {
+ protected string get_img_path ( Api.Node element ) {
return "img/" + element.full_name () + ".png";
}
- protected string get_img_real_path ( DocumentedElement element ) {
+ protected string get_img_real_path ( Api.Node element ) {
return this.settings.path + "/" + element.package.name + "/" + "img/" + element.full_name () + ".png";
}
- protected void write_child_constants ( GLib.FileStream file, ConstantHandler ch, DocumentedElement? mself ) {
+ protected void write_child_constants ( GLib.FileStream file, ConstantHandler ch, Api.Node? mself ) {
Gee.Collection<Constant> constants = ch.get_constant_list ();
if ( constants.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Constants:</h3>\n", css_title );
@@ -1156,7 +1156,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_enums ( GLib.FileStream file, EnumHandler eh, DocumentedElement? mself ) {
+ protected void write_child_enums ( GLib.FileStream file, EnumHandler eh, Api.Node? mself ) {
Gee.Collection<Enum> enums = eh.get_enum_list ();
if ( enums.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Enums:</h3>\n", css_title );
@@ -1170,7 +1170,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_errordomains ( GLib.FileStream file, ErrorDomainHandler eh, DocumentedElement? mself ) {
+ protected void write_child_errordomains ( GLib.FileStream file, ErrorDomainHandler eh, Api.Node? mself ) {
Gee.Collection<ErrorDomain> errdoms = eh.get_error_domain_list ();
if ( errdoms.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Errordomains:</h3>\n", css_title );
@@ -1184,7 +1184,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_construction_methods ( GLib.FileStream file, ConstructionMethodHandler cmh, DocumentedElement? mself ) {
+ protected void write_child_construction_methods ( GLib.FileStream file, ConstructionMethodHandler cmh, Api.Node? mself ) {
Gee.Collection<Method> methods = cmh.get_construction_method_list ();
if ( methods.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Construction Methods:</h3>\n", css_title );
@@ -1198,7 +1198,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_image_block ( GLib.FileStream file, DocumentedElement element ) {
+ protected void write_image_block ( GLib.FileStream file, Api.Node element ) {
string realimgpath = this.get_img_real_path ( element );
string imgpath = this.get_img_path ( element );
@@ -1216,7 +1216,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.printf ( "<img cass=\"%s\" src=\"%s\"/>\n", css_diagram, imgpath );
}
- protected void write_child_fields ( GLib.FileStream file, FieldHandler fh, DocumentedElement? mself ) {
+ protected void write_child_fields ( GLib.FileStream file, FieldHandler fh, Api.Node? mself ) {
Gee.Collection<Field> fields = fh.get_field_list ();
if ( fields.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Fields:</h3>\n", css_title );
@@ -1230,7 +1230,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_properties ( GLib.FileStream file, PropertyHandler ph, DocumentedElement? mself ) {
+ protected void write_child_properties ( GLib.FileStream file, PropertyHandler ph, Api.Node? mself ) {
Gee.Collection<Property> properties = ph.get_property_list ();
if ( properties.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Properties:</h3>\n", css_title );
@@ -1244,7 +1244,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_signals ( GLib.FileStream file, SignalHandler sh, DocumentedElement? mself ) {
+ protected void write_child_signals ( GLib.FileStream file, SignalHandler sh, Api.Node? mself ) {
Gee.Collection<Signal> signals = sh.get_signal_list ();
if ( signals.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Signals:</h3>\n", css_title );
@@ -1258,7 +1258,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_classes ( GLib.FileStream file, ClassHandler clh, DocumentedElement? mself ) {
+ protected void write_child_classes ( GLib.FileStream file, ClassHandler clh, Api.Node? mself ) {
Gee.Collection<Class> classes = clh.get_class_list ();
if ( classes.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Classes:</h3>\n", css_title );
@@ -1280,7 +1280,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_interfaces ( GLib.FileStream file, InterfaceHandler ih, DocumentedElement? mself ) {
+ protected void write_child_interfaces ( GLib.FileStream file, InterfaceHandler ih, Api.Node? mself ) {
Gee.Collection<Interface> ifaces = ih.get_interface_list ( );
if ( ifaces.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Interfaces:</h3>\n", css_title );
@@ -1294,7 +1294,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_delegates ( GLib.FileStream file, DelegateHandler dh, DocumentedElement? mself ) {
+ protected void write_child_delegates ( GLib.FileStream file, DelegateHandler dh, Api.Node? mself ) {
Gee.Collection<Delegate> delegates = dh.get_delegate_list ();
if ( delegates.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Delegates:</h3>\n", css_title );
@@ -1308,7 +1308,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- protected void write_child_structs ( GLib.FileStream file, StructHandler struh, DocumentedElement? mself ) {
+ protected void write_child_structs ( GLib.FileStream file, StructHandler struh, Api.Node? mself ) {
Gee.Collection<Struct> structs = struh.get_struct_list ();
if ( structs.size > 0 ) {
file.printf ( "<h3 class=\"%s\">Structs:</h3>\n", css_title );
@@ -1322,7 +1322,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
}
}
- public void write_namespace_content ( GLib.FileStream file, Namespace ns, DocumentedElement? mself ) {
+ public void write_namespace_content ( GLib.FileStream file, Namespace ns, Api.Node? mself ) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, (ns.name == null)? "Global Namespace" : ns.full_name () );
file.printf ( "\t\t\t\t<hr class=\"%s\" />\n", css_hr );
@@ -1348,7 +1348,7 @@ public abstract class Valadoc.Html.BasicDoclet : Valadoc.Doclet {
file.puts ( "\t\t\t</div>\n" );
}
- protected void write_file_content ( GLib.FileStream file, Package f, DocumentedElement? mself, WikiPage? wikipage = null) {
+ protected void write_file_content ( GLib.FileStream file, Package f, Api.Node? mself, WikiPage? wikipage = null) {
file.printf ( "\t\t\t<div class=\"%s\">\n", css_style_content );
file.printf ( "\t\t\t\t<h1 class=\"%s\">%s:</h1>\n", css_title, f.name );
file.printf ( "\t\t\t\t<hr class=\"%s\" />\n", css_headline_hr );
diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/doclets/htmlhelpers/doclet/globals.vala
index 834b954..edb7cf2 100755
--- a/src/doclets/htmlhelpers/doclet/globals.vala
+++ b/src/doclets/htmlhelpers/doclet/globals.vala
@@ -151,18 +151,18 @@ namespace Valadoc.Html {
bool tmp2 = (element is WikiPage)? ((WikiPage)element).name!="index.valadoc" : element != pos;
if ( tmp2 == true ) {
- prefix = "../" + ((DocumentedElement)element).package.name;
+ prefix = "../" + ((Api.Node)element).package.name;
}
if ( element is Valadoc.EnumValue || element is Valadoc.ErrorCode ) {
- tmp = "#" + ((DocumentedElement)element).name;
- element = (DocumentedElement)((DocumentedElement)element).parent;
+ tmp = "#" + ((Api.Node)element).name;
+ element = (Api.Node)((Api.Node)element).parent;
}
- return prefix + "/" + ((DocumentedElement)element).full_name() + ".html" + tmp;
+ return prefix + "/" + ((Api.Node)element).full_name() + ".html" + tmp;
}
- public string get_html_content_link_css_class ( Valadoc.Basic element ) {
+ public string get_html_content_link_css_class ( Valadoc.Api.Item element ) {
if ( element is Namespace ) {
return css_content_link_namespace;
}
@@ -225,7 +225,7 @@ namespace Valadoc.Html {
return "";
}
- public string get_html_inline_navigation_link_css_class ( Valadoc.Basic element ) {
+ public string get_html_inline_navigation_link_css_class ( Valadoc.Api.Item element ) {
if ( element is Namespace ) {
return css_inline_navigation_namespace;
}
diff --git a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala b/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
index f0df61e..50283a8 100755
--- a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
+++ b/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
@@ -50,11 +50,11 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
element.accept_children (this);
}
- private string get_url (DocumentedElement symbol) {
+ private string get_url (Api.Node symbol) {
return get_html_link (_doclet.settings, symbol, _container);
}
- private void write_symbol_link (DocumentedElement symbol, string label) {
+ private void write_symbol_link (Api.Node symbol, string label) {
var url = get_url (symbol);
_stream.printf ("<a href=\"%s\">%s</a>",
url,
@@ -82,7 +82,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
public override void visit_comment (Comment element) {
Gee.List<Taglet> taglets;
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.Deprecated));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.Deprecated));
write_taglets (
"<p class=\"main_title\"><b>Deprecated:</b> ",
"</p>",
@@ -96,7 +96,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
// Write description
element.accept_children (this);
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.Param));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.Param));
write_taglets (
"<h2 class=\"main_title\">Parameters:</h2>\n<table class=\"main_parameter_table\">",
"</table>",
@@ -109,7 +109,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
_stream.printf ("</td></tr>");
});
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.Return));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.Return));
write_taglets (
"<h2 class=\"main_title\">Returns:</h2>\n<table class=\"main_parameter_table\">",
"</table>",
@@ -122,7 +122,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
_stream.printf ("</td></tr>");
});
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.Throws));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.Throws));
write_taglets (
"<h2 class=\"main_title\">Throws:</h2>\n<table class=\"main_parameter_table\">",
"</table>",
@@ -135,7 +135,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
_stream.printf ("</td></tr>");
});
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.Since));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.Since));
write_taglets (
"<h2 class=\"main_title\">Since:</h2>\n<p>",
"</p>",
@@ -146,7 +146,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
_stream.printf ("%s", since.version);
});
- taglets = element.find_taglets ((DocumentedElement) _container, typeof (Taglets.See));
+ taglets = element.find_taglets ((Api.Node) _container, typeof (Taglets.See));
write_taglets (
"<h2 class=\"main_title\">See also:</h2>\n<p>",
"</p>",
diff --git a/src/doclets/htmlhelpers/doclet/langlet.vala b/src/doclets/htmlhelpers/doclet/langlet.vala
index ae15252..1c3dd85 100755
--- a/src/doclets/htmlhelpers/doclet/langlet.vala
+++ b/src/doclets/htmlhelpers/doclet/langlet.vala
@@ -32,9 +32,9 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
this.settings = settings;
}
- private DocumentedElement position = null;
+ private Api.Node position = null;
- private string get_link ( DocumentedElement element, DocumentedElement? position ) {
+ private string get_link ( Api.Node element, Api.Node? position ) {
return get_html_link ( this.settings, element, position );
}
@@ -52,14 +52,14 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
return false;
}
- private void write_type_name ( DocumentedElement? datatype, GLib.FileStream file ) {
+ private void write_type_name ( Api.Node? datatype, GLib.FileStream file ) {
if ( datatype == null ) {
file.printf ( "<font class=\"%s\">void</font>", css_keyword );
return ;
}
string typename = datatype.full_name ();
- if ( ((DocumentedElement)datatype.parent).name == null && (datatype is Class || datatype is Struct) ) {
+ if ( ((Api.Node)datatype.parent).name == null && (datatype is Class || datatype is Struct) ) {
if ( this.is_basic_type ( typename ) ) {
string link = this.get_link(datatype, this.position );
if ( link == null )
@@ -97,13 +97,13 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
file.puts ( ">" );
}
- private void write_type ( Basic? type, DocumentedElement? pos, GLib.FileStream file ) {
+ private void write_type ( Api.Item? type, Api.Node? pos, GLib.FileStream file ) {
if ( type == null ) {
file.printf ( "<font class=\"%s\">void</font>", css_keyword );
}
- else if ( type is DocumentedElement ) {
- DocumentedElement dtype = (DocumentedElement)type;
- weak string css = (dtype.package.name == "glib-2.0" && ((DocumentedElement)dtype.parent).name == null)? css_basic_type : css_other_type;
+ else if ( type is Api.Node ) {
+ Api.Node dtype = (Api.Node)type;
+ weak string css = (dtype.package.name == "glib-2.0" && ((Api.Node)dtype.parent).name == null)? css_basic_type : css_other_type;
string? link = this.get_link ( dtype, pos );
if ( link == null)
file.printf ( "<font class=\"%s\">%s</font>", css, dtype.name );
@@ -124,16 +124,16 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
}
}
- public override void write_pointer ( Pointer ptr, void* fptr, DocumentedElement pos ) {
+ public override void write_pointer ( Pointer ptr, void* fptr, Api.Node pos ) {
weak GLib.FileStream file = (GLib.FileStream)fptr;
- Basic type = ptr.data_type;
+ Api.Item type = ptr.data_type;
this.write_type ( type, pos, file );
file.putc ( '*' );
}
- public override void write_array ( Array arr, void* fptr, DocumentedElement pos ) {
+ public override void write_array ( Array arr, void* fptr, Api.Node pos ) {
weak GLib.FileStream file = (GLib.FileStream)fptr;
- Basic type =arr.data_type;
+ Api.Item type =arr.data_type;
this.write_type ( type, pos, file );
file.puts ( "[]" );
}
@@ -160,7 +160,7 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
modifiers = null;
- Basic? type = type_reference.data_type;
+ Api.Item? type = type_reference.data_type;
this.write_type ( type, this.position, file ); //TODO: this.position -> pos-parameter
this.write_type_reference_template_arguments ( type_reference, file );
}
@@ -217,7 +217,7 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
}
private void write_exception_list ( ExceptionHandler exception_handler, GLib.FileStream file ) {
- Gee.Collection<DocumentedElement> error_domains = exception_handler.get_error_domains ();
+ Gee.Collection<Api.Node> error_domains = exception_handler.get_error_domains ();
int size = error_domains.size;
int i = 1;
@@ -226,7 +226,7 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
file.printf ( " <span class=\"%s\">throws</span> ", css_keyword );
- foreach ( DocumentedElement type in error_domains ) {
+ foreach ( Api.Node type in error_domains ) {
this.write_type_name ( type, file );
if ( error_domains.size > i ) {
file.puts ( ", " );
@@ -447,11 +447,11 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
this.write_inheritance_list ( stru, file );
}
- public override void write_inheritance_list ( DocumentedElement dtype, void* ptr ) {
+ public override void write_inheritance_list ( Api.Node dtype, void* ptr ) {
weak GLib.FileStream file = (GLib.FileStream)ptr;
Gee.Collection<Interface> lst = null;
- DocumentedElement? base_type = null;
+ Api.Node? base_type = null;
int size = 0;
int i = 1;
@@ -476,7 +476,7 @@ public class Valadoc.Html.BasicLanglet : Valadoc.Langlet {
file.puts ( " : " );
if ( base_type != null ) {
- this.write_type_name ( (DocumentedElement)base_type, file );
+ this.write_type_name ( (Api.Node)base_type, file );
if ( size > 0 ) {
file.puts ( ", " );
}
diff --git a/src/doclets/valadoc.org/doclet/doclet.vala b/src/doclets/valadoc.org/doclet/doclet.vala
index 09842a3..ea00e20 100755
--- a/src/doclets/valadoc.org/doclet/doclet.vala
+++ b/src/doclets/valadoc.org/doclet/doclet.vala
@@ -32,7 +32,7 @@ public class Valadoc.ValdocOrg.Doclet : Valadoc.Doclet {
private FileStream file;
private bool run;
- private void write_documentation (DocumentedElement element) {
+ private void write_documentation (Api.Node element) {
if(element.documentation == null) {
return ;
}
@@ -63,7 +63,7 @@ public class Valadoc.ValdocOrg.Doclet : Valadoc.Doclet {
}
}
- private string get_image_path (DocumentedElement element) {
+ private string get_image_path (Api.Node element) {
return Path.build_filename (this.settings.path, element.package.name, element.package.name, element.full_name () + ".png");
}
@@ -74,7 +74,7 @@ public class Valadoc.ValdocOrg.Doclet : Valadoc.Doclet {
}
// get_type_path()
- private void write_insert_into_valadoc_element (DocumentedElement element) {
+ private void write_insert_into_valadoc_element (Api.Node element) {
string name = element.name;
string fullname;
@@ -101,15 +101,15 @@ public class Valadoc.ValdocOrg.Doclet : Valadoc.Doclet {
}
// get_type_path()
- private void write_insert_into_code_element (DocumentedElement element) {
+ private void write_insert_into_code_element (Api.Node element) {
string api = this.langwriter.from_documented_element (element).to_string (0, "");
string parentnodepkgname;
string parentnodename;
- Basic parent = element.parent;
- if (parent is DocumentedElement) {
- parentnodepkgname = ((DocumentedElement)parent).package.name;
- parentnodename = ((DocumentedElement)parent).full_name();
+ Api.Item parent = element.parent;
+ if (parent is Api.Node) {
+ parentnodepkgname = ((Api.Node)parent).package.name;
+ parentnodename = ((Api.Node)parent).full_name();
if (parentnodename == null) {
parentnodename = parentnodepkgname;
}
@@ -761,7 +761,7 @@ public class Valadoc.ValdocOrg.Doclet : Valadoc.Doclet {
this.write_documentation (m);
}
- private string get_type_path (DocumentedElement element) {
+ private string get_type_path (Api.Node element) {
if(element.name == null) {
return element.package.name;
}
diff --git a/src/doclets/valadoc.org/html-apiwriter/apiwriter-vala.vala b/src/doclets/valadoc.org/html-apiwriter/apiwriter-vala.vala
index 5b5fb59..6e4f147 100755
--- a/src/doclets/valadoc.org/html-apiwriter/apiwriter-vala.vala
+++ b/src/doclets/valadoc.org/html-apiwriter/apiwriter-vala.vala
@@ -29,14 +29,14 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
return span;
}
- private Entry parents (DocumentedElement type) {
+ private Entry parents (Api.Node type) {
Span span = new Span ();
span.add_attribute (this.cssparentlist);
Gee.Collection<Interface>? interfaces = null;
- Basic? basetype = null;
+ Api.Item? basetype = null;
- bool documentedelement;
+ bool Api.Node;
if (type is Interface) {
interfaces = ((Interface)type).get_implemented_interface_list ();
@@ -55,7 +55,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
}
if (basetype != null) {
- span.add_child (this.type (basetype, out documentedelement));
+ span.add_child (this.type (basetype, out Api.Node));
}
if (interfaces != null) {
@@ -65,7 +65,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
int i = 0;
foreach (Interface iface in interfaces) {
- span.add_child (this.type (iface, out documentedelement));
+ span.add_child (this.type (iface, out Api.Node));
if (interfaces.size < ++i) {
span.add_child (new String (", "));
}
@@ -75,10 +75,10 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
return span;
}
- private Entry type (Basic? type, out bool documentedelement) {
+ private Entry type (Api.Item? type, out bool Api.Node) {
ArrayList<Entry> elements = new ArrayList<Entry> ();
weak Attribute css = this.csstype;
- documentedelement = false;
+ Api.Node = false;
while (true) {
if (type == null) {
@@ -98,8 +98,8 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
elements.insert (0, new String (((TypeParameter)type).name));
break;
}
- else if (type is DocumentedElement) {
- weak DocumentedElement dtype = (DocumentedElement)type;
+ else if (type is Api.Node) {
+ weak Api.Node dtype = (Api.Node)type;
if (dtype.package.name == "glib-2.0" && dtype.nspace.name == null && (dtype is Struct || dtype is Class)) {
css = this.cssbasictype;
}
@@ -107,7 +107,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
HyperLink link = new HyperLink ("/%s/%s.html".printf (dtype.package.name, dtype.full_name ()), new String (dtype.name));
link.add_attribute (csslink);
elements.insert (0, link);
- documentedelement = true;
+ Api.Node = true;
break;
}
else { // typereference
@@ -154,7 +154,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
private ArrayList<Entry> type_reference (TypeReference typeref) {
ArrayList<Entry> list = new ArrayList<Entry> ();
- bool documentedelement;
+ bool Api.Node;
StringBuilder str = new StringBuilder ();
//if(typeref.pass_ownership) {
@@ -180,7 +180,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
list.add (this.keyword (str.str));
}
- list.add (this.type (typeref.data_type, out documentedelement));
+ list.add (this.type (typeref.data_type, out Api.Node));
Collection<TypeReference> typeargs = typeref.get_type_arguments ();
if (typeargs.size != 0) {
@@ -200,7 +200,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
list.add (new String (">"));
}
- if(typeref.is_nullable && documentedelement) {
+ if(typeref.is_nullable && Api.Node) {
list.add(new String("?"));
}
@@ -279,14 +279,14 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
}
}
- private Entry exception (DocumentedElement element) {
+ private Entry exception (Api.Node element) {
Span span = new Span();
span.add_child (new String (element.full_name()));
return span;
}
private Entry? exceptions (ExceptionHandler exh) {
- Collection<DocumentedElement> errs = exh.get_error_domains ();
+ Collection<Api.Node> errs = exh.get_error_domains ();
if (errs.size == 0) {
return null;
}
@@ -296,7 +296,7 @@ public class Valadoc.Html.ValaApiWriter : ApiWriter {
span.add_child (this.keyword(" throws "));
- foreach (DocumentedElement type in errs) {
+ foreach (Api.Node type in errs) {
span.add_child (this.exception(type));
}
diff --git a/src/doclets/valadoc.org/html-apiwriter/apiwriter.vala b/src/doclets/valadoc.org/html-apiwriter/apiwriter.vala
index 0e675bd..30df72b 100755
--- a/src/doclets/valadoc.org/html-apiwriter/apiwriter.vala
+++ b/src/doclets/valadoc.org/html-apiwriter/apiwriter.vala
@@ -48,7 +48,7 @@ public abstract class Valadoc.Html.ApiWriter {
public abstract Div from_interface (Interface iface);
public abstract Div from_property (Property prop);
- public Div from_documented_element (DocumentedElement el) {
+ public Div from_documented_element (Api.Node el) {
if (el is Method) {
return this.from_method ((Method)el);
}
diff --git a/src/doclets/valadoc.org/taglets/image.vala b/src/doclets/valadoc.org/taglets/image.vala
index d545605..beb3dc2 100755
--- a/src/doclets/valadoc.org/taglets/image.vala
+++ b/src/doclets/valadoc.org/taglets/image.vala
@@ -32,8 +32,8 @@ public class Valadoc.ValadocOrg.ImageDocElement : Valadoc.ImageDocElement {
return false;
}
- this.imgpath = (pos is DocumentedElement)?
- Path.build_filename (settings.path, ((DocumentedElement)pos).package.name, "wiki-images", Path.get_basename (path)) :
+ this.imgpath = (pos is Api.Node)?
+ Path.build_filename (settings.path, ((Api.Node)pos).package.name, "wiki-images", Path.get_basename (path)) :
Path.build_filename (settings.path, settings.pkg_name, "wiki-images", Path.get_basename (path));
this.path = path;
diff --git a/src/doclets/valadoc.org/taglets/parameter.vala b/src/doclets/valadoc.org/taglets/parameter.vala
index 8a60d70..6ef4d0b 100755
--- a/src/doclets/valadoc.org/taglets/parameter.vala
+++ b/src/doclets/valadoc.org/taglets/parameter.vala
@@ -65,7 +65,7 @@ public class Valadoc.ValadocOrg.ParameterTaglet : Valadoc.MainTaglet {
return true;
}
- public override bool parse (Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
+ public override bool parse (Settings settings, Tree tree, Api.Node me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
if (me is Valadoc.ParameterListHandler == false) {
errmsg = "Tag @param cannot be used in this context";
errlvl = ErrorLevel.ERROR;
diff --git a/src/doclets/valadoc.org/taglets/return.vala b/src/doclets/valadoc.org/taglets/return.vala
index 0f0780a..e2bcc5a 100755
--- a/src/doclets/valadoc.org/taglets/return.vala
+++ b/src/doclets/valadoc.org/taglets/return.vala
@@ -26,7 +26,7 @@ public class Valadoc.ValadocOrg.ReturnTaglet : Valadoc.MainTaglet {
public override int order { get { return 300; } }
private Gee.Collection<DocElement> content;
- public override bool parse (Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
+ public override bool parse (Settings settings, Tree tree, Api.Node me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
if (!(me is Valadoc.Method || me is Valadoc.Signal || me is Valadoc.Delegate)) {
errmsg = "Tag @return cannot be used in this context";
errlvl = ErrorLevel.ERROR;
diff --git a/src/doclets/valadoc.org/taglets/see.vala b/src/doclets/valadoc.org/taglets/see.vala
index 5d83e0a..05b9a85 100755
--- a/src/doclets/valadoc.org/taglets/see.vala
+++ b/src/doclets/valadoc.org/taglets/see.vala
@@ -40,7 +40,7 @@ public class Valadoc.ValadocOrg.SeeTaglet : MainTaglet {
return true;
}
- public override bool parse (Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
+ public override bool parse (Settings settings, Tree tree, Api.Node me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
if (content.size != 1) {
errmsg = "Type name was expected";
errlvl = ErrorLevel.ERROR;
@@ -57,7 +57,7 @@ public class Valadoc.ValadocOrg.SeeTaglet : MainTaglet {
return false;
}
- Valadoc.DocumentedElement? node = tree.search_symbol_str (me, ((StringTaglet)element).content.strip ());
+ Valadoc.Api.Node? node = tree.search_symbol_str (me, ((StringTaglet)element).content.strip ());
if (node == null) {
errmsg = "Linked type is not available";
errlvl = ErrorLevel.ERROR;
diff --git a/src/doclets/valadoc.org/taglets/since.vala b/src/doclets/valadoc.org/taglets/since.vala
index 8a55c45..996914a 100755
--- a/src/doclets/valadoc.org/taglets/since.vala
+++ b/src/doclets/valadoc.org/taglets/since.vala
@@ -41,7 +41,7 @@ public class Valadoc.ValadocOrg.SinceTaglet : Valadoc.MainTaglet {
return true;
}
- public override bool parse (Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
+ public override bool parse (Settings settings, Tree tree, Api.Node me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg) {
if (content.size != 1) {
errmsg = "Version name was expected";
errlvl = ErrorLevel.ERROR;
diff --git a/src/doclets/valadoc.org/taglets/throws.vala b/src/doclets/valadoc.org/taglets/throws.vala
index ef9f01f..fbc3117 100755
--- a/src/doclets/valadoc.org/taglets/throws.vala
+++ b/src/doclets/valadoc.org/taglets/throws.vala
@@ -27,7 +27,7 @@ public class Valadoc.ValadocOrg.ExceptionTaglet : Valadoc.MainTaglet {
private Gee.ArrayList<DocElement> content;
private string paramname;
- public override bool parse ( Settings settings, Tree tree, DocumentedElement me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg ) {
+ public override bool parse ( Settings settings, Tree tree, Api.Node me, Gee.Collection<DocElement> content, ref ErrorLevel errlvl, out string errmsg ) {
if ( me is Valadoc.ExceptionHandler == false ) {
errmsg = "Tag @throws cannot be used in this context";
errlvl = ErrorLevel.ERROR;
@@ -92,7 +92,7 @@ public class Valadoc.ValadocOrg.ExceptionTaglet : Valadoc.MainTaglet {
private bool check_exception_parameter_name ( Valadoc.ExceptionHandler me, string paramname ) {
string paramname2 = "."+paramname;
- foreach ( DocumentedElement param in me.get_error_domains() ) {
+ foreach ( Api.Node param in me.get_error_domains() ) {
if ( param.name == paramname || param.full_name() == paramname || param.full_name().has_suffix(paramname2) ) {
return true;
}
diff --git a/src/doclets/valadoc.org/taglets/typelink.vala b/src/doclets/valadoc.org/taglets/typelink.vala
index 46b2f08..a261fe8 100755
--- a/src/doclets/valadoc.org/taglets/typelink.vala
+++ b/src/doclets/valadoc.org/taglets/typelink.vala
@@ -36,7 +36,7 @@ public class Valadoc.ValadocOrg.TypeLinkInlineTaglet : Valadoc.InlineTaglet {
}
protected override bool parse (Settings settings, Tree tree, Documentation self, string content, ref ErrorLevel errlvl, out string? errmsg) {
- Valadoc.DocumentedElement? element = tree.search_symbol_str ( (self is DocumentedElement)? (DocumentedElement)self : null, content.strip() );
+ Valadoc.Api.Node? element = tree.search_symbol_str ( (self is Api.Node)? (Api.Node)self : null, content.strip() );
if (element == null) {
errmsg = "Linked type is not available";
errlvl = ErrorLevel.ERROR;
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 58471d8..76e2cdf 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -41,7 +41,6 @@ libvaladoc_la_VALASOURCES = \
apitree/apitree.vala \
apitree/apitypesymbolnode.vala \
apitree/array.vala \
- apitree/basic.vala \
apitree/class.vala \
apitree/classhandler.vala \
apitree/constant.vala \
@@ -49,7 +48,6 @@ libvaladoc_la_VALASOURCES = \
apitree/constructionmethodhandler.vala \
apitree/delegate.vala \
apitree/delegatehandler.vala \
- apitree/documentedelement.vala \
apitree/enum.vala \
apitree/enumhandler.vala \
apitree/enumvalue.vala \
diff --git a/src/libvaladoc/apitree/apinode.vala b/src/libvaladoc/apitree/apinode.vala
index 5037502..1dad866 100644
--- a/src/libvaladoc/apitree/apinode.vala
+++ b/src/libvaladoc/apitree/apinode.vala
@@ -46,12 +46,10 @@ public enum Valadoc.Api.NodeType {
TYPE_PARAMETER
}
-// TODO Drop DocumentedElement
-public abstract class Valadoc.Api.Node : /*Api.Item*/DocumentedElement, Visitable {
+public abstract class Valadoc.Api.Node : Api.Item, Visitable, Documentation {
private bool do_document = false;
- // TODO Drop DocumentElement
- /* public abstract string? name { owned get; } */
+ public abstract string? name { owned get; }
public abstract NodeType node_type { get; }
@@ -71,7 +69,7 @@ public abstract class Valadoc.Api.Node : /*Api.Item*/DocumentedElement, Visitabl
public abstract bool is_visitor_accessible (Settings settings);
- public override string? get_filename () {
+ public virtual string? get_filename () {
return null;
}
@@ -150,5 +148,66 @@ public abstract class Valadoc.Api.Node : /*Api.Item*/DocumentedElement, Visitabl
return per_symbol_children.get (symbol);
}
-
+ private Namespace? _nspace = null;
+ private Package? _package = null;
+ private string _full_name = null;
+ private int _line = -1;
+
+ public Namespace? nspace {
+ get {
+ if (this._nspace == null) {
+ Api.Item ast = this;
+ while (ast is Valadoc.Namespace == false) {
+ ast = ast.parent;
+ if (ast == null)
+ return null;
+ }
+ this._nspace = (Valadoc.Namespace)ast;
+ }
+ return this._nspace;
+ }
+ }
+
+
+ public Package? package {
+ get {
+ if (this._package == null) {
+ Api.Item ast = this;
+ while (ast is Valadoc.Package == false) {
+ ast = ast.parent;
+ if (ast == null)
+ return null;
+ }
+ this._package = (Valadoc.Package)ast;
+ }
+ return this._package;
+ }
+ }
+
+ public Content.Comment? documentation {
+ protected set;
+ get;
+ }
+
+ // rename to get_full_name
+ public string? full_name () {
+ if (this._full_name == null) {
+ if (this.name == null)
+ return null;
+
+ GLib.StringBuilder full_name = new GLib.StringBuilder (this.name);
+
+ if (this.parent != null) {
+ for (Api.Item pos = this.parent; pos is Package == false ; pos = pos.parent) {
+ string name = ((Api.Node)pos).name;
+ if (name != null) {
+ full_name.prepend_unichar ('.');
+ full_name.prepend (name);
+ }
+ }
+ }
+ this._full_name = full_name.str;
+ }
+ return this._full_name;
+ }
}
diff --git a/src/libvaladoc/apitree/apitree.vala b/src/libvaladoc/apitree/apitree.vala
index 6f929d9..e6152b0 100644
--- a/src/libvaladoc/apitree/apitree.vala
+++ b/src/libvaladoc/apitree/apitree.vala
@@ -76,7 +76,7 @@ public class Valadoc.Tree {
return node;
}
- public DocumentedElement? search_symbol_str (DocumentedElement? element, string symname) {
+ public Api.Node? search_symbol_str (Api.Node? element, string symname) {
string[] path = split_name (symname);
if (element == null) {
@@ -84,13 +84,13 @@ public class Valadoc.Tree {
foreach (Package packgage in packages) {
node = search_relative_to (packgage, path);
if (node != null) {
- return (DocumentedElement) node;
+ return (Api.Node) node;
}
}
return null;
}
- return (DocumentedElement) search_relative_to ((Api.Node) element, path);
+ return (Api.Node) search_relative_to ((Api.Node) element, path);
}
private string[] split_name (string full_name) {
@@ -334,7 +334,7 @@ public class Valadoc.Tree {
}
}
- internal DocumentedElement? search_vala_symbol (Vala.Symbol? vnode) {
+ internal Api.Node? search_vala_symbol (Vala.Symbol? vnode) {
if (vnode == null)
return null;
diff --git a/src/libvaladoc/apitree/array.vala b/src/libvaladoc/apitree/array.vala
index f0f1b8b..9330cc7 100644
--- a/src/libvaladoc/apitree/array.vala
+++ b/src/libvaladoc/apitree/array.vala
@@ -23,10 +23,10 @@ using GLib;
using Gee;
-public class Valadoc.Array : Basic {
+public class Valadoc.Array : Api.Item {
private Vala.ArrayType vtype;
- public Basic data_type {
+ public Api.Item data_type {
private set;
get;
}
@@ -42,7 +42,7 @@ public class Valadoc.Array : Basic {
this.data_type = new TypeReference (vntype, this);
}
- public void write (Langlet langlet, void* ptr, DocumentedElement parent) {
+ public void write (Langlet langlet, void* ptr, Api.Node parent) {
langlet.write_array (this, ptr, parent);
}
diff --git a/src/libvaladoc/apitree/class.vala b/src/libvaladoc/apitree/class.vala
index 5566a78..688c0f9 100644
--- a/src/libvaladoc/apitree/class.vala
+++ b/src/libvaladoc/apitree/class.vala
@@ -82,7 +82,7 @@ public class Valadoc.Class : Api.TypeSymbolNode, ClassHandler, StructHandler, Si
return ;
foreach ( Vala.DataType vtyperef in lst ) {
- Basic? element = root.search_vala_symbol ( vtyperef.data_type );
+ Api.Item? element = root.search_vala_symbol ( vtyperef.data_type );
if ( element is Class ) {
this.base_type = (Class)element;
}
diff --git a/src/libvaladoc/apitree/exceptionlisthandler.vala b/src/libvaladoc/apitree/exceptionlisthandler.vala
index 936278b..a256b30 100644
--- a/src/libvaladoc/apitree/exceptionlisthandler.vala
+++ b/src/libvaladoc/apitree/exceptionlisthandler.vala
@@ -24,7 +24,7 @@ using Gee;
// rename to ExceptionListHandler
public interface Valadoc.ExceptionHandler : Api.Node {
- public Gee.Collection<DocumentedElement> get_error_domains () {
+ public Gee.Collection<Api.Node> get_error_domains () {
return get_children_by_type (Api.NodeType.ERROR_DOMAIN);
}
diff --git a/src/libvaladoc/apitree/interface.vala b/src/libvaladoc/apitree/interface.vala
index 8ea3fd6..e1ffc2c 100644
--- a/src/libvaladoc/apitree/interface.vala
+++ b/src/libvaladoc/apitree/interface.vala
@@ -65,7 +65,7 @@ public class Valadoc.Interface : Api.TypeSymbolNode, SignalHandler, PropertyHand
return ;
foreach ( Vala.DataType vtyperef in lst ) {
- Basic? element = root.search_vala_symbol ( vtyperef.data_type );
+ Api.Item? element = root.search_vala_symbol ( vtyperef.data_type );
if ( element is Class )
this.base_type = (Class)element;
else
diff --git a/src/libvaladoc/apitree/method.vala b/src/libvaladoc/apitree/method.vala
index 0b28b7e..6d35628 100644
--- a/src/libvaladoc/apitree/method.vala
+++ b/src/libvaladoc/apitree/method.vala
@@ -97,9 +97,9 @@ public class Valadoc.Method : Api.MemberNode, ParameterListHandler, ExceptionHan
owned get {
if (this.is_constructor) {
if (this.vmethod.name == ".new")
- return ((DocumentedElement)this.parent).name;
+ return ((Api.Node)this.parent).name;
else
- return ((DocumentedElement)this.parent).name + "." + this.vmethod.name;
+ return ((Api.Node)this.parent).name + "." + this.vmethod.name;
}
else {
return this.vmethod.name;
diff --git a/src/libvaladoc/apitree/pointer.vala b/src/libvaladoc/apitree/pointer.vala
index aac5e7d..d96e7ad 100644
--- a/src/libvaladoc/apitree/pointer.vala
+++ b/src/libvaladoc/apitree/pointer.vala
@@ -24,10 +24,10 @@ using Gee;
-public class Valadoc.Pointer : Basic {
+public class Valadoc.Pointer : Api.Item {
private Vala.PointerType vtype;
- public Basic data_type {
+ public Api.Item data_type {
private set;
get;
}
@@ -45,12 +45,12 @@ public class Valadoc.Pointer : Basic {
this.data_type = new TypeReference (vntype, this);
}
- public void write (Langlet langlet, void* ptr, DocumentedElement parent) {
+ public void write (Langlet langlet, void* ptr, Api.Node parent) {
langlet.write_pointer (this, ptr, parent);
}
protected override void resolve_type_references (Tree root) {
- Basic type = this.data_type;
+ Api.Item type = this.data_type;
if ( type == null )
;
else if ( type is Array )
diff --git a/src/libvaladoc/apitree/returntypehandler.vala b/src/libvaladoc/apitree/returntypehandler.vala
index c9887e9..0314801 100644
--- a/src/libvaladoc/apitree/returntypehandler.vala
+++ b/src/libvaladoc/apitree/returntypehandler.vala
@@ -21,7 +21,7 @@ using Vala;
using GLib;
using Gee;
-public interface Valadoc.ReturnTypeHandler : Basic {
+public interface Valadoc.ReturnTypeHandler : Api.Item {
public abstract TypeReference? type_reference {
protected set;
get;
diff --git a/src/libvaladoc/apitree/typereference.vala b/src/libvaladoc/apitree/typereference.vala
index 1360930..09d0284 100644
--- a/src/libvaladoc/apitree/typereference.vala
+++ b/src/libvaladoc/apitree/typereference.vala
@@ -23,7 +23,7 @@ using GLib;
using Gee;
-public class Valadoc.TypeReference : Basic {
+public class Valadoc.TypeReference : Api.Item {
private Gee.ArrayList<TypeReference> type_arguments = new Gee.ArrayList<TypeReference> ();
private Vala.DataType? vtyperef;
@@ -44,7 +44,7 @@ public class Valadoc.TypeReference : Basic {
}
}
- public Basic? data_type {
+ public Api.Item? data_type {
private set;
get;
}
diff --git a/src/libvaladoc/content/blockcontent.vala b/src/libvaladoc/content/blockcontent.vala
index 138618b..beece63 100755
--- a/src/libvaladoc/content/blockcontent.vala
+++ b/src/libvaladoc/content/blockcontent.vala
@@ -36,7 +36,7 @@ public abstract class Valadoc.Content.BlockContent : ContentElement {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
foreach (Block element in _content) {
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/comment.vala b/src/libvaladoc/content/comment.vala
index 5bf656d..6146935 100755
--- a/src/libvaladoc/content/comment.vala
+++ b/src/libvaladoc/content/comment.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.Comment : BlockContent {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
base.check (api_root, container, reporter);
foreach (Taglet element in _taglets) {
@@ -57,7 +57,7 @@ public class Valadoc.Content.Comment : BlockContent {
}
}
- public Gee.List<Taglet> find_taglets (DocumentedElement? container, Type taglet_type) {
+ public Gee.List<Taglet> find_taglets (Api.Node? container, Type taglet_type) {
Gee.List<Taglet> selected_taglets = new ArrayList<Taglet> ();
// TODO inherit stuff if needed
diff --git a/src/libvaladoc/content/contentelement.vala b/src/libvaladoc/content/contentelement.vala
index 0f2d409..37efd27 100755
--- a/src/libvaladoc/content/contentelement.vala
+++ b/src/libvaladoc/content/contentelement.vala
@@ -29,7 +29,7 @@ public abstract class Valadoc.Content.ContentElement : Object {
public virtual void configure (Settings settings, ResourceLocator locator) {
}
- public abstract void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter);
+ public abstract void check (Tree api_root, Api.Node? container, ErrorReporter reporter);
public abstract void accept (ContentVisitor visitor);
diff --git a/src/libvaladoc/content/embedded.vala b/src/libvaladoc/content/embedded.vala
index 543a776..7f7db16 100755
--- a/src/libvaladoc/content/embedded.vala
+++ b/src/libvaladoc/content/embedded.vala
@@ -42,7 +42,7 @@ public class Valadoc.Content.Embedded : ContentElement, Inline, StyleAttributes
_locator = locator;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check the image exists if it a local resource
}
diff --git a/src/libvaladoc/content/headline.vala b/src/libvaladoc/content/headline.vala
index 1d11a74..0e76844 100755
--- a/src/libvaladoc/content/headline.vala
+++ b/src/libvaladoc/content/headline.vala
@@ -32,7 +32,7 @@ public class Valadoc.Content.Headline : Block, InlineContent {
_level = 0;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO report error if level == 0 ?
// Check inline content
diff --git a/src/libvaladoc/content/highlighted.vala b/src/libvaladoc/content/highlighted.vala
index 2842a00..3e4576a 100755
--- a/src/libvaladoc/content/highlighted.vala
+++ b/src/libvaladoc/content/highlighted.vala
@@ -41,7 +41,7 @@ public class Valadoc.Content.Highlighted : InlineContent, Inline {
_style = style;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/inlinecontent.vala b/src/libvaladoc/content/inlinecontent.vala
index 147b9e5..390526b 100755
--- a/src/libvaladoc/content/inlinecontent.vala
+++ b/src/libvaladoc/content/inlinecontent.vala
@@ -36,7 +36,7 @@ public abstract class Valadoc.Content.InlineContent : ContentElement {
internal InlineContent () {
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
foreach (Inline element in _content) {
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/inlinetaglet.vala b/src/libvaladoc/content/inlinetaglet.vala
index f474c14..83b76bf 100755
--- a/src/libvaladoc/content/inlinetaglet.vala
+++ b/src/libvaladoc/content/inlinetaglet.vala
@@ -49,7 +49,7 @@ public abstract class Valadoc.Content.InlineTaglet : ContentElement, Taglet, Inl
this.locator = locator;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
ContentElement element = get_content ();
element.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/link.vala b/src/libvaladoc/content/link.vala
index 2f9abbb..613b188 100755
--- a/src/libvaladoc/content/link.vala
+++ b/src/libvaladoc/content/link.vala
@@ -35,7 +35,7 @@ public class Valadoc.Content.Link : ContentElement, Inline {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/list.vala b/src/libvaladoc/content/list.vala
index 59987bf..5a52620 100755
--- a/src/libvaladoc/content/list.vala
+++ b/src/libvaladoc/content/list.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.List : ContentElement, Block {
_items = new ArrayList<ListItem> ();
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check the list consistency in terms of successive item levels ?
// Check individual list items
diff --git a/src/libvaladoc/content/listitem.vala b/src/libvaladoc/content/listitem.vala
index 9b11a4b..1cbcaa8 100755
--- a/src/libvaladoc/content/listitem.vala
+++ b/src/libvaladoc/content/listitem.vala
@@ -44,7 +44,7 @@ public class Valadoc.Content.ListItem : InlineContent {
_level = 0;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO report error if level == 0 ?
// Check inline content
diff --git a/src/libvaladoc/content/paragraph.vala b/src/libvaladoc/content/paragraph.vala
index 138c4c3..8537222 100755
--- a/src/libvaladoc/content/paragraph.vala
+++ b/src/libvaladoc/content/paragraph.vala
@@ -33,7 +33,7 @@ public class Valadoc.Content.Paragraph : InlineContent, Block, StyleAttributes {
base ();
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/sourcecode.vala b/src/libvaladoc/content/sourcecode.vala
index 4be3aa2..9b0ff72 100755
--- a/src/libvaladoc/content/sourcecode.vala
+++ b/src/libvaladoc/content/sourcecode.vala
@@ -39,7 +39,7 @@ public class Valadoc.Content.SourceCode : ContentElement, Block {
_language = Language.VALA;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/symbollink.vala b/src/libvaladoc/content/symbollink.vala
index e5ab034..9e13f4a 100755
--- a/src/libvaladoc/content/symbollink.vala
+++ b/src/libvaladoc/content/symbollink.vala
@@ -25,10 +25,10 @@ using GLib;
using Gee;
public class Valadoc.Content.SymbolLink : ContentElement, Inline {
- public DocumentedElement symbol { get; set; }
+ public Api.Node symbol { get; set; }
public string label { get; set; }
- internal SymbolLink (DocumentedElement? symbol = null, string? label = null) {
+ internal SymbolLink (Api.Node? symbol = null, string? label = null) {
base ();
_symbol = symbol;
_label = label;
@@ -37,7 +37,7 @@ public class Valadoc.Content.SymbolLink : ContentElement, Inline {
public override void configure (Settings settings, ResourceLocator locator) {
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/content/table.vala b/src/libvaladoc/content/table.vala
index acb6754..0acf4d5 100755
--- a/src/libvaladoc/content/table.vala
+++ b/src/libvaladoc/content/table.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.Table : ContentElement, Block {
_rows = new ArrayList<TableRow> ();
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check the table consistency in term of row/column number
// Check individual rows
diff --git a/src/libvaladoc/content/tablecell.vala b/src/libvaladoc/content/tablecell.vala
index d816d34..3ada7cc 100755
--- a/src/libvaladoc/content/tablecell.vala
+++ b/src/libvaladoc/content/tablecell.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.TableCell : InlineContent, StyleAttributes {
_rowspan = 1;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check inline content
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/content/tablerow.vala b/src/libvaladoc/content/tablerow.vala
index e60cd46..0011d19 100755
--- a/src/libvaladoc/content/tablerow.vala
+++ b/src/libvaladoc/content/tablerow.vala
@@ -34,7 +34,7 @@ public class Valadoc.Content.TableRow : ContentElement {
_cells = new ArrayList<TableCell> ();
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// Check individual cells
foreach (var cell in _cells) {
cell.check (api_root, container, reporter);
diff --git a/src/libvaladoc/content/text.vala b/src/libvaladoc/content/text.vala
index c749b1a..0019495 100755
--- a/src/libvaladoc/content/text.vala
+++ b/src/libvaladoc/content/text.vala
@@ -37,7 +37,7 @@ public class Valadoc.Content.Text : ContentElement, Inline {
}
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/documentation/documentationparser.vala b/src/libvaladoc/documentation/documentationparser.vala
index 6e3f24b..29144e5 100644
--- a/src/libvaladoc/documentation/documentationparser.vala
+++ b/src/libvaladoc/documentation/documentationparser.vala
@@ -59,7 +59,7 @@ public class Valadoc.DocumentationParser : Object, ResourceLocator {
private Parser _parser;
private WikiScanner _scanner;
- public Comment? parse (DocumentedElement element, Vala.Comment source_comment) {
+ public Comment? parse (Api.Node element, Vala.Comment source_comment) {
weak string content = source_comment.content;
var source_ref = source_comment.source_reference;
try {
diff --git a/src/libvaladoc/drawer.vala b/src/libvaladoc/drawer.vala
index 10f6784..55da15d 100755
--- a/src/libvaladoc/drawer.vala
+++ b/src/libvaladoc/drawer.vala
@@ -8,7 +8,7 @@ using Gee;
namespace Valadoc.Diagrams {
// replace with .full_name
- private static inline string get_diagram_node_name ( DocumentedElement type ) {
+ private static inline string get_diagram_node_name ( Api.Node type ) {
string name = "";
if ( type.nspace.full_name() != null ) {
name = type.nspace.full_name() + ".";
diff --git a/src/libvaladoc/langlet.vala b/src/libvaladoc/langlet.vala
index 3f68d6c..da68fa0 100755
--- a/src/libvaladoc/langlet.vala
+++ b/src/libvaladoc/langlet.vala
@@ -22,11 +22,11 @@ using GLib;
// deprecated
public abstract class Valadoc.Langlet : Object {
- public abstract void write_pointer (Pointer param, void* ptr, DocumentedElement pos);
- public abstract void write_array (Array param, void* ptr, DocumentedElement pos);
+ public abstract void write_pointer (Pointer param, void* ptr, Api.Node pos);
+ public abstract void write_array (Array param, void* ptr, Api.Node pos);
public abstract void write_type_parameter (TypeParameter param, void* ptr);
public abstract void write_template_parameters (TemplateParameterListHandler thandler, void* ptr);
- public abstract void write_inheritance_list (DocumentedElement dtype, void* ptr);
+ public abstract void write_inheritance_list (Api.Node dtype, void* ptr);
public abstract void write_parameter_list (ParameterListHandler thandler, void* ptr);
public abstract void write_field (Valadoc.Field field, Valadoc.FieldHandler pos, void* ptr);
public abstract void write_constant (Valadoc.Constant constant, Valadoc.ConstantHandler parent, void* ptr);
diff --git a/src/libvaladoc/taglets/tagletdeprecated.vala b/src/libvaladoc/taglets/tagletdeprecated.vala
index 7efc2bc..cbe0da1 100755
--- a/src/libvaladoc/taglets/tagletdeprecated.vala
+++ b/src/libvaladoc/taglets/tagletdeprecated.vala
@@ -30,7 +30,7 @@ public class Valadoc.Taglets.Deprecated : InlineContent, Taglet, Block {
return run_rule;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
base.check (api_root, container, reporter);
}
diff --git a/src/libvaladoc/taglets/tagletinheritdoc.vala b/src/libvaladoc/taglets/tagletinheritdoc.vala
index f4ff918..9280a51 100755
--- a/src/libvaladoc/taglets/tagletinheritdoc.vala
+++ b/src/libvaladoc/taglets/tagletinheritdoc.vala
@@ -26,13 +26,13 @@ using Gee;
using Valadoc.Content;
public class Valadoc.Taglets.InheritDoc : InlineTaglet {
- private DocumentedElement? _inherited;
+ private Api.Node? _inherited;
public override Rule? get_parser_rule (Rule run_rule) {
return null;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO Check that the container is an override of an abstract symbol
// Also retrieve that abstract symbol _inherited
diff --git a/src/libvaladoc/taglets/tagletlink.vala b/src/libvaladoc/taglets/tagletlink.vala
index 9849560..256a7ab 100755
--- a/src/libvaladoc/taglets/tagletlink.vala
+++ b/src/libvaladoc/taglets/tagletlink.vala
@@ -28,7 +28,7 @@ using Valadoc.Content;
public class Valadoc.Taglets.Link : InlineTaglet {
public string symbol_name { private set; get; }
- private DocumentedElement _symbol;
+ private Api.Node _symbol;
public override Rule? get_parser_rule (Rule run_rule) {
return Rule.seq ({
@@ -36,7 +36,7 @@ public class Valadoc.Taglets.Link : InlineTaglet {
});
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
_symbol = api_root.search_symbol_str (container, symbol_name);
if (_symbol == null) {
// TODO use ContentElement's source reference
diff --git a/src/libvaladoc/taglets/tagletparam.vala b/src/libvaladoc/taglets/tagletparam.vala
index 7864411..c646be6 100755
--- a/src/libvaladoc/taglets/tagletparam.vala
+++ b/src/libvaladoc/taglets/tagletparam.vala
@@ -36,7 +36,7 @@ public class Valadoc.Taglets.Param : InlineContent, Taglet, Block {
});
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO check for the existence of such a parameter
base.check (api_root, container, reporter);
diff --git a/src/libvaladoc/taglets/tagletreturn.vala b/src/libvaladoc/taglets/tagletreturn.vala
index c43c8d5..dea2dc3 100755
--- a/src/libvaladoc/taglets/tagletreturn.vala
+++ b/src/libvaladoc/taglets/tagletreturn.vala
@@ -30,7 +30,7 @@ public class Valadoc.Taglets.Return : InlineContent, Taglet, Block {
return run_rule;
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
// TODO check for the existence of a return type
base.check (api_root, container, reporter);
diff --git a/src/libvaladoc/taglets/tagletsee.vala b/src/libvaladoc/taglets/tagletsee.vala
index 533a48c..5b5ccf7 100755
--- a/src/libvaladoc/taglets/tagletsee.vala
+++ b/src/libvaladoc/taglets/tagletsee.vala
@@ -27,7 +27,7 @@ using Valadoc.Content;
public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
public string symbol_name { private set; get; }
- public DocumentedElement symbol { private set; get; }
+ public Api.Node symbol { private set; get; }
public Rule? get_parser_rule (Rule run_rule) {
return Rule.seq ({
@@ -35,7 +35,7 @@ public class Valadoc.Taglets.See : ContentElement, Taglet, Block {
});
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
symbol = api_root.search_symbol_str (container, symbol_name);
if (symbol == null) {
// TODO use ContentElement's source reference
diff --git a/src/libvaladoc/taglets/tagletsince.vala b/src/libvaladoc/taglets/tagletsince.vala
index e895c13..1c83dfb 100755
--- a/src/libvaladoc/taglets/tagletsince.vala
+++ b/src/libvaladoc/taglets/tagletsince.vala
@@ -34,7 +34,7 @@ public class Valadoc.Taglets.Since : ContentElement, Taglet, Block {
});
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
}
public override void accept (ContentVisitor visitor) {
diff --git a/src/libvaladoc/taglets/tagletthrows.vala b/src/libvaladoc/taglets/tagletthrows.vala
index 5fd7937..3f097be 100755
--- a/src/libvaladoc/taglets/tagletthrows.vala
+++ b/src/libvaladoc/taglets/tagletthrows.vala
@@ -27,7 +27,7 @@ using Valadoc.Content;
public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
public string error_domain_name { private set; get; }
- public DocumentedElement error_domain { private set; get; }
+ public Api.Node error_domain { private set; get; }
public Rule? get_parser_rule (Rule run_rule) {
return Rule.seq ({
@@ -37,7 +37,7 @@ public class Valadoc.Taglets.Throws : InlineContent, Taglet, Block {
});
}
- public override void check (Tree api_root, DocumentedElement? container, ErrorReporter reporter) {
+ public override void check (Tree api_root, Api.Node? container, ErrorReporter reporter) {
error_domain = api_root.search_symbol_str (container, error_domain_name);
if (error_domain == null) {
// TODO use ContentElement's source reference
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
