[valadoc] Api: Move to api/, make class names consistent and update Makefile

From: Florian Brosch <flobrosch src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [valadoc] Api: Move to api/, make class names consistent and update Makefile
Date: Sat, 17 Oct 2009 00:16:52 +0000 (UTC)
commit 568598c83e99f21a0715c4790b1e90c392076f73
Author: Didier 'Ptitjes <ptitjes free fr>
Date:   Fri Oct 16 21:06:13 2009 +0200

    Api: Move to api/, make class names consistent and update Makefile

 src/libvaladoc/Makefile.am                         |   96 ++++++++++----------
 src/libvaladoc/{apitree => api}/array.vala         |    0
 src/libvaladoc/{apitree => api}/class.vala         |    2 +-
 src/libvaladoc/{apitree => api}/classhandler.vala  |    0
 src/libvaladoc/{apitree => api}/constant.vala      |    2 +-
 .../{apitree => api}/constanthandler.vala          |    0
 .../constructionmethodhandler.vala                 |    0
 src/libvaladoc/{apitree => api}/delegate.vala      |    2 +-
 .../{apitree => api}/delegatehandler.vala          |    0
 src/libvaladoc/{apitree => api}/enum.vala          |    2 +-
 src/libvaladoc/{apitree => api}/enumhandler.vala   |    0
 src/libvaladoc/{apitree => api}/enumvalue.vala     |    2 +-
 src/libvaladoc/{apitree => api}/errorcode.vala     |    2 +-
 src/libvaladoc/{apitree => api}/errordomain.vala   |    2 +-
 .../{apitree => api}/errordomainhandler.vala       |    0
 .../{apitree => api}/exceptionlisthandler.vala     |    0
 src/libvaladoc/{apitree => api}/field.vala         |    2 +-
 src/libvaladoc/{apitree => api}/fieldhandler.vala  |    0
 .../{apitree => api}/formalparameter.vala          |    2 +-
 src/libvaladoc/{apitree => api}/interface.vala     |    2 +-
 .../{apitree => api}/interfacehandler.vala         |    0
 .../{apitree/apiitem.vala => api/item.vala}        |    4 +-
 .../apimembernode.vala => api/member.vala}         |    6 +-
 src/libvaladoc/{apitree => api}/method.vala        |    2 +-
 src/libvaladoc/{apitree => api}/methodhandler.vala |    0
 src/libvaladoc/{apitree => api}/namespace.vala     |    2 +-
 .../{apitree => api}/namespacehandler.vala         |    0
 .../{apitree/apinode.vala => api/node.vala}        |    4 +-
 .../apinodebuilder.vala => api/nodebuilder.vala}   |   35 ++++----
 src/libvaladoc/{apitree => api}/package.vala       |    0
 .../{apitree => api}/parameterlisthandler.vala     |    0
 src/libvaladoc/{apitree => api}/pointer.vala       |    0
 src/libvaladoc/{apitree => api}/property.vala      |    2 +-
 .../{apitree => api}/propertyaccessor.vala         |    2 +-
 .../{apitree => api}/propertyhandler.vala          |    0
 .../{apitree => api}/returntypehandler.vala        |    0
 src/libvaladoc/{apitree => api}/signal.vala        |    2 +-
 src/libvaladoc/{apitree => api}/signalhandler.vala |    0
 .../{apitree => api}/signaturebuilder.vala         |    0
 src/libvaladoc/{apitree => api}/struct.vala        |    2 +-
 src/libvaladoc/{apitree => api}/structhandler.vala |    0
 .../apisymbolnode.vala => api/symbol.vala}         |    8 +-
 .../{apitree => api}/symbolaccessibility.vala      |    0
 .../templateparameterlisthandler.vala              |    0
 .../{apitree/apitree.vala => api/tree.vala}        |    5 +-
 src/libvaladoc/{apitree => api}/typeparameter.vala |    2 +-
 src/libvaladoc/{apitree => api}/typereference.vala |    4 +-
 .../apitypesymbolnode.vala => api/typesymbol.vala} |    8 +-
 src/libvaladoc/{apitree => api}/visitable.vala     |    0
 49 files changed, 97 insertions(+), 107 deletions(-)
---
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 5aca3a8..5ace867 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -33,54 +33,54 @@ libvaladoc_la_VALASOURCES = \
 	documentation/documentationparser.vala \
 	documentation/wiki.vala \
 	documentation/wikiscanner.vala \
-	apitree/apiitem.vala \
-	apitree/apimembernode.vala \
-	apitree/apinode.vala \
-	apitree/apinodebuilder.vala \
-	apitree/apisymbolnode.vala \
-	apitree/apitree.vala \
-	apitree/apitypesymbolnode.vala \
-	apitree/array.vala \
-	apitree/class.vala \
-	apitree/classhandler.vala \
-	apitree/constant.vala \
-	apitree/constanthandler.vala \
-	apitree/constructionmethodhandler.vala \
-	apitree/delegate.vala \
-	apitree/delegatehandler.vala \
-	apitree/enum.vala \
-	apitree/enumhandler.vala \
-	apitree/enumvalue.vala \
-	apitree/errorcode.vala \
-	apitree/errordomain.vala \
-	apitree/errordomainhandler.vala \
-	apitree/exceptionlisthandler.vala \
-	apitree/field.vala \
-	apitree/fieldhandler.vala \
-	apitree/formalparameter.vala \
-	apitree/interface.vala \
-	apitree/interfacehandler.vala \
-	apitree/method.vala \
-	apitree/methodhandler.vala \
-	apitree/namespace.vala \
-	apitree/namespacehandler.vala \
-	apitree/package.vala \
-	apitree/parameterlisthandler.vala \
-	apitree/pointer.vala \
-	apitree/property.vala \
-	apitree/propertyaccessor.vala \
-	apitree/propertyhandler.vala \
-	apitree/returntypehandler.vala \
-	apitree/signal.vala \
-	apitree/signalhandler.vala \
-	apitree/signaturebuilder.vala \
-	apitree/struct.vala \
-	apitree/structhandler.vala \
-	apitree/symbolaccessibility.vala \
-	apitree/templateparameterlisthandler.vala \
-	apitree/typeparameter.vala \
-	apitree/typereference.vala \
-	apitree/visitable.vala \
+	api/array.vala \
+	api/class.vala \
+	api/classhandler.vala \
+	api/constant.vala \
+	api/constanthandler.vala \
+	api/constructionmethodhandler.vala \
+	api/delegate.vala \
+	api/delegatehandler.vala \
+	api/enum.vala \
+	api/enumhandler.vala \
+	api/enumvalue.vala \
+	api/errorcode.vala \
+	api/errordomain.vala \
+	api/errordomainhandler.vala \
+	api/exceptionlisthandler.vala \
+	api/field.vala \
+	api/fieldhandler.vala \
+	api/formalparameter.vala \
+	api/interface.vala \
+	api/interfacehandler.vala \
+	api/item.vala \
+	api/member.vala \
+	api/method.vala \
+	api/methodhandler.vala \
+	api/namespace.vala \
+	api/namespacehandler.vala \
+	api/node.vala \
+	api/nodebuilder.vala \
+	api/package.vala \
+	api/parameterlisthandler.vala \
+	api/pointer.vala \
+	api/property.vala \
+	api/propertyaccessor.vala \
+	api/propertyhandler.vala \
+	api/returntypehandler.vala \
+	api/signal.vala \
+	api/signalhandler.vala \
+	api/signaturebuilder.vala \
+	api/struct.vala \
+	api/structhandler.vala \
+	api/symbol.vala \
+	api/symbolaccessibility.vala \
+	api/templateparameterlisthandler.vala \
+	api/tree.vala \
+	api/typeparameter.vala \
+	api/typereference.vala \
+	api/typesymbol.vala \
+	api/visitable.vala \
 	content/block.vala \
 	content/blockcontent.vala \
 	content/comment.vala \
diff --git a/src/libvaladoc/apitree/array.vala b/src/libvaladoc/api/array.vala
similarity index 100%
rename from src/libvaladoc/apitree/array.vala
rename to src/libvaladoc/api/array.vala
diff --git a/src/libvaladoc/apitree/class.vala b/src/libvaladoc/api/class.vala
similarity index 93%
rename from src/libvaladoc/apitree/class.vala
rename to src/libvaladoc/api/class.vala
index fe30777..ad08764 100644
--- a/src/libvaladoc/apitree/class.vala
+++ b/src/libvaladoc/api/class.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Class : TypeSymbolNode, ClassHandler, StructHandler, SignalHandler, MethodHandler, EnumHandler, PropertyHandler, ConstructionMethodHandler, FieldHandler, DelegateHandler, ConstantHandler, TemplateParameterListHandler {
+public class Valadoc.Api.Class : TypeSymbol, ClassHandler, StructHandler, SignalHandler, MethodHandler, EnumHandler, PropertyHandler, ConstructionMethodHandler, FieldHandler, DelegateHandler, ConstantHandler, TemplateParameterListHandler {
 	private ArrayList<TypeReference> interfaces;
 	private Vala.Class vclass;
 
diff --git a/src/libvaladoc/apitree/classhandler.vala b/src/libvaladoc/api/classhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/classhandler.vala
rename to src/libvaladoc/api/classhandler.vala
diff --git a/src/libvaladoc/apitree/constant.vala b/src/libvaladoc/api/constant.vala
similarity index 96%
rename from src/libvaladoc/apitree/constant.vala
rename to src/libvaladoc/api/constant.vala
index e3accae..916d6b8 100644
--- a/src/libvaladoc/apitree/constant.vala
+++ b/src/libvaladoc/api/constant.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Constant : MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Constant : Member, ReturnTypeHandler {
 	private Vala.Constant vconst;
 
 	public TypeReference? type_reference {
diff --git a/src/libvaladoc/apitree/constanthandler.vala b/src/libvaladoc/api/constanthandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/constanthandler.vala
rename to src/libvaladoc/api/constanthandler.vala
diff --git a/src/libvaladoc/apitree/constructionmethodhandler.vala b/src/libvaladoc/api/constructionmethodhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/constructionmethodhandler.vala
rename to src/libvaladoc/api/constructionmethodhandler.vala
diff --git a/src/libvaladoc/apitree/delegate.vala b/src/libvaladoc/api/delegate.vala
similarity index 95%
rename from src/libvaladoc/apitree/delegate.vala
rename to src/libvaladoc/api/delegate.vala
index 641aad8..5991362 100644
--- a/src/libvaladoc/apitree/delegate.vala
+++ b/src/libvaladoc/api/delegate.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Delegate : TypeSymbolNode, ParameterListHandler, ReturnTypeHandler, TemplateParameterListHandler, ExceptionHandler {
+public class Valadoc.Api.Delegate : TypeSymbol, ParameterListHandler, ReturnTypeHandler, TemplateParameterListHandler, ExceptionHandler {
 	private Vala.Delegate vdelegate;
 
 	public Delegate (Vala.Delegate symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/delegatehandler.vala b/src/libvaladoc/api/delegatehandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/delegatehandler.vala
rename to src/libvaladoc/api/delegatehandler.vala
diff --git a/src/libvaladoc/apitree/enum.vala b/src/libvaladoc/api/enum.vala
similarity index 96%
rename from src/libvaladoc/apitree/enum.vala
rename to src/libvaladoc/api/enum.vala
index dd44f3b..2fe59c9 100644
--- a/src/libvaladoc/apitree/enum.vala
+++ b/src/libvaladoc/api/enum.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Enum : TypeSymbolNode, MethodHandler {
+public class Valadoc.Api.Enum : TypeSymbol, MethodHandler {
 	public Enum (Vala.Enum symbol, Node parent) {
 		base (symbol, parent);
 		this.venum = symbol;
diff --git a/src/libvaladoc/apitree/enumhandler.vala b/src/libvaladoc/api/enumhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/enumhandler.vala
rename to src/libvaladoc/api/enumhandler.vala
diff --git a/src/libvaladoc/apitree/enumvalue.vala b/src/libvaladoc/api/enumvalue.vala
similarity index 97%
rename from src/libvaladoc/apitree/enumvalue.vala
rename to src/libvaladoc/api/enumvalue.vala
index c3860b8..94c005d 100644
--- a/src/libvaladoc/apitree/enumvalue.vala
+++ b/src/libvaladoc/api/enumvalue.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.EnumValue: SymbolNode {
+public class Valadoc.Api.EnumValue: Symbol {
 	private Vala.EnumValue venval;
 
 	public EnumValue (Vala.EnumValue symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/errorcode.vala b/src/libvaladoc/api/errorcode.vala
similarity index 96%
rename from src/libvaladoc/apitree/errorcode.vala
rename to src/libvaladoc/api/errorcode.vala
index 443cda3..bf0f592 100644
--- a/src/libvaladoc/apitree/errorcode.vala
+++ b/src/libvaladoc/api/errorcode.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.ErrorCode : TypeSymbolNode {
+public class Valadoc.Api.ErrorCode : TypeSymbol {
 	private Vala.ErrorCode verrcode;
 
 	public ErrorCode (Vala.ErrorCode symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/errordomain.vala b/src/libvaladoc/api/errordomain.vala
similarity index 95%
rename from src/libvaladoc/apitree/errordomain.vala
rename to src/libvaladoc/api/errordomain.vala
index cfcde52..28c3265 100644
--- a/src/libvaladoc/apitree/errordomain.vala
+++ b/src/libvaladoc/api/errordomain.vala
@@ -21,7 +21,7 @@ using Gee;
 using Valadoc.Content;
 
 
-public class Valadoc.Api.ErrorDomain : TypeSymbolNode, MethodHandler {
+public class Valadoc.Api.ErrorDomain : TypeSymbol, MethodHandler {
 	private Vala.ErrorDomain verrdom;
 
 	public ErrorDomain (Vala.ErrorDomain symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/errordomainhandler.vala b/src/libvaladoc/api/errordomainhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/errordomainhandler.vala
rename to src/libvaladoc/api/errordomainhandler.vala
diff --git a/src/libvaladoc/apitree/exceptionlisthandler.vala b/src/libvaladoc/api/exceptionlisthandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/exceptionlisthandler.vala
rename to src/libvaladoc/api/exceptionlisthandler.vala
diff --git a/src/libvaladoc/apitree/field.vala b/src/libvaladoc/api/field.vala
similarity index 97%
rename from src/libvaladoc/apitree/field.vala
rename to src/libvaladoc/api/field.vala
index 3b25b64..20707b4 100644
--- a/src/libvaladoc/apitree/field.vala
+++ b/src/libvaladoc/api/field.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Field : MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Field : Member, ReturnTypeHandler {
 	private Vala.Field vfield;
 
 	public Field (Vala.Field symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/fieldhandler.vala b/src/libvaladoc/api/fieldhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/fieldhandler.vala
rename to src/libvaladoc/api/fieldhandler.vala
diff --git a/src/libvaladoc/apitree/formalparameter.vala b/src/libvaladoc/api/formalparameter.vala
similarity index 96%
rename from src/libvaladoc/apitree/formalparameter.vala
rename to src/libvaladoc/api/formalparameter.vala
index f9aca98..c7ca7ff 100644
--- a/src/libvaladoc/apitree/formalparameter.vala
+++ b/src/libvaladoc/api/formalparameter.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.FormalParameter : SymbolNode, ReturnTypeHandler {
+public class Valadoc.Api.FormalParameter : Symbol, ReturnTypeHandler {
 	private Vala.FormalParameter vformalparam;
 
 	public FormalParameter (Vala.FormalParameter symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/interface.vala b/src/libvaladoc/api/interface.vala
similarity index 93%
rename from src/libvaladoc/apitree/interface.vala
rename to src/libvaladoc/api/interface.vala
index e43b4c9..c4c44c5 100644
--- a/src/libvaladoc/apitree/interface.vala
+++ b/src/libvaladoc/api/interface.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Interface : TypeSymbolNode, SignalHandler, PropertyHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler, MethodHandler, DelegateHandler, EnumHandler, StructHandler, ClassHandler {
+public class Valadoc.Api.Interface : TypeSymbol, SignalHandler, PropertyHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler, MethodHandler, DelegateHandler, EnumHandler, StructHandler, ClassHandler {
 	public Interface (Vala.Interface symbol, Node parent) {
 		base (symbol, parent);
 		this.vinterface = symbol;
diff --git a/src/libvaladoc/apitree/interfacehandler.vala b/src/libvaladoc/api/interfacehandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/interfacehandler.vala
rename to src/libvaladoc/api/interfacehandler.vala
diff --git a/src/libvaladoc/apitree/apiitem.vala b/src/libvaladoc/api/item.vala
similarity index 98%
rename from src/libvaladoc/apitree/apiitem.vala
rename to src/libvaladoc/api/item.vala
index fa78d31..ed5aa61 100644
--- a/src/libvaladoc/apitree/apiitem.vala
+++ b/src/libvaladoc/api/item.vala
@@ -1,4 +1,4 @@
-/* apiitem.vala
+/* item.vala
  *
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008 Florian Brosch
@@ -21,7 +21,6 @@
 using Valadoc.Content;
 using Gee;
 
-
 public abstract class Valadoc.Api.Item : Object {
 	private Inline _signature;
 
@@ -47,4 +46,3 @@ public abstract class Valadoc.Api.Item : Object {
 
 	protected abstract Inline build_signature ();
 }
-
diff --git a/src/libvaladoc/apitree/apimembernode.vala b/src/libvaladoc/api/member.vala
similarity index 89%
rename from src/libvaladoc/apitree/apimembernode.vala
rename to src/libvaladoc/api/member.vala
index 91a5170..836df22 100644
--- a/src/libvaladoc/apitree/apimembernode.vala
+++ b/src/libvaladoc/api/member.vala
@@ -1,4 +1,4 @@
-/* apitypesymbolnode.vala
+/* member.vala
  * 
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
@@ -23,9 +23,9 @@
 
 using Gee;
 
-public abstract class Valadoc.Api.MemberNode : SymbolNode {
+public abstract class Valadoc.Api.Member : Symbol {
 
-	public MemberNode (Vala.Member symbol, Node parent) {
+	public Member (Vala.Member symbol, Node parent) {
 		base (symbol, parent);
 	}
 
diff --git a/src/libvaladoc/apitree/method.vala b/src/libvaladoc/api/method.vala
similarity index 97%
rename from src/libvaladoc/apitree/method.vala
rename to src/libvaladoc/api/method.vala
index 61be9a1..7329c4b 100644
--- a/src/libvaladoc/apitree/method.vala
+++ b/src/libvaladoc/api/method.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Method : MemberNode, ParameterListHandler, ExceptionHandler, TemplateParameterListHandler, ReturnTypeHandler {
+public class Valadoc.Api.Method : Member, ParameterListHandler, ExceptionHandler, TemplateParameterListHandler, ReturnTypeHandler {
 	private Vala.Method vmethod;
 
 	public Method (Vala.Method symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/methodhandler.vala b/src/libvaladoc/api/methodhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/methodhandler.vala
rename to src/libvaladoc/api/methodhandler.vala
diff --git a/src/libvaladoc/apitree/namespace.vala b/src/libvaladoc/api/namespace.vala
similarity index 94%
rename from src/libvaladoc/apitree/namespace.vala
rename to src/libvaladoc/api/namespace.vala
index 457671c..eb23187 100644
--- a/src/libvaladoc/apitree/namespace.vala
+++ b/src/libvaladoc/api/namespace.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Namespace : SymbolNode, MethodHandler, FieldHandler, NamespaceHandler, ErrorDomainHandler,
+public class Valadoc.Api.Namespace : Symbol, MethodHandler, FieldHandler, NamespaceHandler, ErrorDomainHandler,
                                  EnumHandler, ClassHandler, StructHandler, InterfaceHandler,
                                  DelegateHandler, ConstantHandler
 {
diff --git a/src/libvaladoc/apitree/namespacehandler.vala b/src/libvaladoc/api/namespacehandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/namespacehandler.vala
rename to src/libvaladoc/api/namespacehandler.vala
diff --git a/src/libvaladoc/apitree/apinode.vala b/src/libvaladoc/api/node.vala
similarity index 99%
rename from src/libvaladoc/apitree/apinode.vala
rename to src/libvaladoc/api/node.vala
index af3cbf6..4b37283 100644
--- a/src/libvaladoc/apitree/apinode.vala
+++ b/src/libvaladoc/api/node.vala
@@ -23,7 +23,6 @@
 
 using Gee;
 
-
 public enum Valadoc.Api.NodeType {
 	CLASS,
 	CONSTANT,
@@ -73,7 +72,7 @@ public abstract class Valadoc.Api.Node : Item, Visitable, Documentation {
 		return null;
 	}
 
-	protected void add_child (SymbolNode child) {
+	protected void add_child (Symbol child) {
 		if (child.name != null) {
 			per_name_children.set (child.name, child);
 		} else {
@@ -211,4 +210,3 @@ public abstract class Valadoc.Api.Node : Item, Visitable, Documentation {
 		return this._full_name;
 	}
 }
-
diff --git a/src/libvaladoc/apitree/apinodebuilder.vala b/src/libvaladoc/api/nodebuilder.vala
similarity index 85%
rename from src/libvaladoc/apitree/apinodebuilder.vala
rename to src/libvaladoc/api/nodebuilder.vala
index a950d11..7b79fd0 100644
--- a/src/libvaladoc/apitree/apinodebuilder.vala
+++ b/src/libvaladoc/api/nodebuilder.vala
@@ -1,4 +1,4 @@
-/* apinodebuilder.vala
+/* nodebuilder.vala
  * 
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
@@ -23,7 +23,6 @@
 
 using Gee;
 
-
 internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	private Tree root;
 	private Collection<Package> packages;
@@ -68,7 +67,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_class (Vala.Class element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Class (element, parent);
+		Symbol node = new Class (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -77,7 +76,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_interface (Vala.Interface element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Interface (element, parent);
+		Symbol node = new Interface (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -86,7 +85,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_struct (Vala.Struct element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Struct (element, parent);
+		Symbol node = new Struct (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -95,7 +94,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_field (Vala.Field element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Field (element, parent);
+		Symbol node = new Field (element, parent);
 		parent.add_child (node);
 
 		// Process field type
@@ -106,7 +105,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_property (Vala.Property element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Property (element, parent);
+		Symbol node = new Property (element, parent);
 		parent.add_child (node);
 
 		// Process property type
@@ -117,7 +116,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_creation_method (Vala.CreationMethod element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Method (element, parent);
+		Symbol node = new Method (element, parent);
 		parent.add_child (node);
 
 		// Process error types
@@ -129,7 +128,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_method (Vala.Method element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Method (element, parent);
+		Symbol node = new Method (element, parent);
 		parent.add_child (node);
 
 		// Process error types
@@ -141,7 +140,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_signal (Vala.Signal element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Signal (element, parent);
+		Symbol node = new Signal (element, parent);
 		parent.add_child (node);
 
 		// Process return type
@@ -152,7 +151,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_delegate (Vala.Delegate element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Delegate (element, parent);
+		Symbol node = new Delegate (element, parent);
 		parent.add_child (node);
 
 		// Process error types
@@ -164,7 +163,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_enum (Vala.Enum element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Enum (element, parent);
+		Symbol node = new Enum (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -173,7 +172,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_enum_value (Vala.EnumValue element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new EnumValue (element, parent);
+		Symbol node = new EnumValue (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -182,7 +181,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_constant (Vala.Constant element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new Constant (element, parent);
+		Symbol node = new Constant (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -191,7 +190,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_error_domain (Vala.ErrorDomain element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new ErrorDomain (element, parent);
+		Symbol node = new ErrorDomain (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -200,7 +199,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_error_code (Vala.ErrorCode element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new ErrorCode (element, parent);
+		Symbol node = new ErrorCode (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -209,7 +208,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_type_parameter (Vala.TypeParameter element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new TypeParameter (element, parent);
+		Symbol node = new TypeParameter (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
@@ -218,7 +217,7 @@ internal class Valadoc.Api.NodeBuilder : Vala.CodeVisitor {
 	public override void visit_formal_parameter (Vala.FormalParameter element) {
 		Node parent = get_parent_node_for (element);
 
-		SymbolNode node = new FormalParameter (element, parent);
+		Symbol node = new FormalParameter (element, parent);
 		parent.add_child (node);
 
 		process_children (node, element);
diff --git a/src/libvaladoc/apitree/package.vala b/src/libvaladoc/api/package.vala
similarity index 100%
rename from src/libvaladoc/apitree/package.vala
rename to src/libvaladoc/api/package.vala
diff --git a/src/libvaladoc/apitree/parameterlisthandler.vala b/src/libvaladoc/api/parameterlisthandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/parameterlisthandler.vala
rename to src/libvaladoc/api/parameterlisthandler.vala
diff --git a/src/libvaladoc/apitree/pointer.vala b/src/libvaladoc/api/pointer.vala
similarity index 100%
rename from src/libvaladoc/apitree/pointer.vala
rename to src/libvaladoc/api/pointer.vala
diff --git a/src/libvaladoc/apitree/property.vala b/src/libvaladoc/api/property.vala
similarity index 98%
rename from src/libvaladoc/apitree/property.vala
rename to src/libvaladoc/api/property.vala
index 41dce6f..ba95a5b 100644
--- a/src/libvaladoc/apitree/property.vala
+++ b/src/libvaladoc/api/property.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Property : MemberNode, ReturnTypeHandler {
+public class Valadoc.Api.Property : Member, ReturnTypeHandler {
 	private Vala.Property vproperty;
 
 	public Property (Vala.Property symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/propertyaccessor.vala b/src/libvaladoc/api/propertyaccessor.vala
similarity index 97%
rename from src/libvaladoc/apitree/propertyaccessor.vala
rename to src/libvaladoc/api/propertyaccessor.vala
index 76043be..2151ac6 100644
--- a/src/libvaladoc/apitree/propertyaccessor.vala
+++ b/src/libvaladoc/api/propertyaccessor.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.PropertyAccessor : SymbolNode {
+public class Valadoc.Api.PropertyAccessor : Symbol {
 	private Vala.PropertyAccessor vpropacc;
 
 	public PropertyAccessor (Vala.PropertyAccessor symbol, Property parent) {
diff --git a/src/libvaladoc/apitree/propertyhandler.vala b/src/libvaladoc/api/propertyhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/propertyhandler.vala
rename to src/libvaladoc/api/propertyhandler.vala
diff --git a/src/libvaladoc/apitree/returntypehandler.vala b/src/libvaladoc/api/returntypehandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/returntypehandler.vala
rename to src/libvaladoc/api/returntypehandler.vala
diff --git a/src/libvaladoc/apitree/signal.vala b/src/libvaladoc/api/signal.vala
similarity index 96%
rename from src/libvaladoc/apitree/signal.vala
rename to src/libvaladoc/api/signal.vala
index 63a65cc..dde91c5 100644
--- a/src/libvaladoc/apitree/signal.vala
+++ b/src/libvaladoc/api/signal.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Signal : MemberNode, ParameterListHandler, ReturnTypeHandler {
+public class Valadoc.Api.Signal : Member, ParameterListHandler, ReturnTypeHandler {
 	private Vala.Signal vsignal;
 
 	public Signal (Vala.Signal symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/signalhandler.vala b/src/libvaladoc/api/signalhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/signalhandler.vala
rename to src/libvaladoc/api/signalhandler.vala
diff --git a/src/libvaladoc/apitree/signaturebuilder.vala b/src/libvaladoc/api/signaturebuilder.vala
similarity index 100%
rename from src/libvaladoc/apitree/signaturebuilder.vala
rename to src/libvaladoc/api/signaturebuilder.vala
diff --git a/src/libvaladoc/apitree/struct.vala b/src/libvaladoc/api/struct.vala
similarity index 94%
rename from src/libvaladoc/apitree/struct.vala
rename to src/libvaladoc/api/struct.vala
index 30a6018..7c15cdf 100644
--- a/src/libvaladoc/apitree/struct.vala
+++ b/src/libvaladoc/api/struct.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.Struct : TypeSymbolNode, MethodHandler, ConstructionMethodHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler {
+public class Valadoc.Api.Struct : TypeSymbol, MethodHandler, ConstructionMethodHandler, FieldHandler, ConstantHandler, TemplateParameterListHandler {
 	private Vala.Struct vstruct;
 
 	public Struct (Vala.Struct symbol, Node parent) {
diff --git a/src/libvaladoc/apitree/structhandler.vala b/src/libvaladoc/api/structhandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/structhandler.vala
rename to src/libvaladoc/api/structhandler.vala
diff --git a/src/libvaladoc/apitree/apisymbolnode.vala b/src/libvaladoc/api/symbol.vala
similarity index 93%
rename from src/libvaladoc/apitree/apisymbolnode.vala
rename to src/libvaladoc/api/symbol.vala
index 3db9ca5..4727963 100644
--- a/src/libvaladoc/apitree/apisymbolnode.vala
+++ b/src/libvaladoc/api/symbol.vala
@@ -1,4 +1,4 @@
-/* apisymbolnode.vala
+/* symbol.vala
  * 
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
@@ -23,8 +23,7 @@
 
 using Gee;
 
-
-public abstract class Valadoc.Api.SymbolNode : Node, SymbolAccessibility {
+public abstract class Valadoc.Api.Symbol : Node, SymbolAccessibility {
 
 	protected Vala.Symbol symbol { private set; get; }
 	// TODO Drop DocumentedElement
@@ -36,7 +35,7 @@ public abstract class Valadoc.Api.SymbolNode : Node, SymbolAccessibility {
 		}
 	}
 
-	public SymbolNode (Vala.Symbol symbol, Node parent) {
+	public Symbol (Vala.Symbol symbol, Node parent) {
 		base (parent);
 		this.symbol = symbol;
 	}
@@ -105,4 +104,3 @@ public abstract class Valadoc.Api.SymbolNode : Node, SymbolAccessibility {
 		}
 	}
 }
-
diff --git a/src/libvaladoc/apitree/symbolaccessibility.vala b/src/libvaladoc/api/symbolaccessibility.vala
similarity index 100%
rename from src/libvaladoc/apitree/symbolaccessibility.vala
rename to src/libvaladoc/api/symbolaccessibility.vala
diff --git a/src/libvaladoc/apitree/templateparameterlisthandler.vala b/src/libvaladoc/api/templateparameterlisthandler.vala
similarity index 100%
rename from src/libvaladoc/apitree/templateparameterlisthandler.vala
rename to src/libvaladoc/api/templateparameterlisthandler.vala
diff --git a/src/libvaladoc/apitree/apitree.vala b/src/libvaladoc/api/tree.vala
similarity index 99%
rename from src/libvaladoc/apitree/apitree.vala
rename to src/libvaladoc/api/tree.vala
index b398c08..8a2977f 100644
--- a/src/libvaladoc/apitree/apitree.vala
+++ b/src/libvaladoc/api/tree.vala
@@ -1,4 +1,5 @@
-/*
+/* tree.vala
+ *
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008 Florian Brosch
  * 
@@ -373,6 +374,4 @@ public class Valadoc.Api.Tree {
 		}
 		return null;
 	}
-
 }
-
diff --git a/src/libvaladoc/apitree/typeparameter.vala b/src/libvaladoc/api/typeparameter.vala
similarity index 94%
rename from src/libvaladoc/apitree/typeparameter.vala
rename to src/libvaladoc/api/typeparameter.vala
index c17bf9e..d74806c 100644
--- a/src/libvaladoc/apitree/typeparameter.vala
+++ b/src/libvaladoc/api/typeparameter.vala
@@ -20,7 +20,7 @@
 using Gee;
 using Valadoc.Content;
 
-public class Valadoc.Api.TypeParameter : SymbolNode, ReturnTypeHandler {
+public class Valadoc.Api.TypeParameter : Symbol, ReturnTypeHandler {
 
 	public TypeParameter (Vala.TypeParameter symbol, Node parent) {
 		base (symbol, parent);
diff --git a/src/libvaladoc/apitree/typereference.vala b/src/libvaladoc/api/typereference.vala
similarity index 98%
rename from src/libvaladoc/apitree/typereference.vala
rename to src/libvaladoc/api/typereference.vala
index 77490a4..fad2072 100644
--- a/src/libvaladoc/apitree/typereference.vala
+++ b/src/libvaladoc/api/typereference.vala
@@ -224,8 +224,8 @@ public class Valadoc.Api.TypeReference : Item {
 
 		if (data_type == null) {
 			signature.append_keyword ("void");
-		} else if (data_type is SymbolNode) {
-			signature.append_type ((SymbolNode) data_type);
+		} else if (data_type is Symbol) {
+			signature.append_type ((Symbol) data_type);
 		} else {
 			signature.append_content (data_type.signature);
 		}
diff --git a/src/libvaladoc/apitree/apitypesymbolnode.vala b/src/libvaladoc/api/typesymbol.vala
similarity index 88%
rename from src/libvaladoc/apitree/apitypesymbolnode.vala
rename to src/libvaladoc/api/typesymbol.vala
index e21ebd2..fe1afa6 100644
--- a/src/libvaladoc/apitree/apitypesymbolnode.vala
+++ b/src/libvaladoc/api/typesymbol.vala
@@ -1,4 +1,4 @@
-/* apitypesymbolnode.vala
+/* typesymbol.vala
  * 
  * Valadoc.Api.- a documentation tool for vala.
  * Copyright (C) 2008-2009 Florian Brosch, Didier Villevalois
@@ -23,10 +23,9 @@
 
 using Gee;
 
+public abstract class Valadoc.Api.TypeSymbol : Symbol {
 
-public abstract class Valadoc.Api.TypeSymbolNode : SymbolNode {
-
-	public TypeSymbolNode (Vala.TypeSymbol symbol, Node parent) {
+	public TypeSymbol (Vala.TypeSymbol symbol, Node parent) {
 		base (symbol, parent);
 	}
 
@@ -39,4 +38,3 @@ public abstract class Valadoc.Api.TypeSymbolNode : SymbolNode {
 		base.process_comments (settings, parser);
 	}
 }
-
diff --git a/src/libvaladoc/apitree/visitable.vala b/src/libvaladoc/api/visitable.vala
similarity index 100%
rename from src/libvaladoc/apitree/visitable.vala
rename to src/libvaladoc/api/visitable.vala
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]