GNOME.org
 

[valadoc] libvaladoc/api rename full_name () to get_full_name ()

commit 2dd9470123f95f0778b0d28067ffb7752e24c9da
Author: Florian Brosch <flo brosch gmail com>
Date:   Sat May 22 14:06:09 2010 +0200

    libvaladoc/api rename full_name () to get_full_name ()

 src/doclets/devhelp/doclet.vala               |    8 ++++----
 src/doclets/htm/doclet.vala                   |    6 +++---
 src/doclets/valadoc.org/doclet.vala           |    6 +++---
 src/doclets/xml/xmlrenderer.vala              |    4 ++--
 src/libvaladoc/api/class.vala                 |    2 +-
 src/libvaladoc/api/node.vala                  |    3 +--
 src/libvaladoc/charts/chartfactory.vala       |    2 +-
 src/libvaladoc/charts/simplechartfactory.vala |    4 ++--
 src/libvaladoc/html/basicdoclet.vala          |   14 +++++++-------
 src/libvaladoc/html/htmlrenderer.vala         |    2 +-
 src/libvaladoc/html/linkhelper.vala           |   12 ++++++------
 11 files changed, 31 insertions(+), 32 deletions(-)
---
diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index e06a946..b0e2796 100755
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -45,11 +45,11 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 	}
 
 	private string get_path (Api.Node element) {
-		return element.full_name () + ".html";
+		return element.get_full_name () + ".html";
 	}
 
 	private string get_real_path (Api.Node element) {
-		return GLib.Path.build_filename (this.settings.path, this.package_dir_name, element.full_name () + ".html");
+		return GLib.Path.build_filename (this.settings.path, this.package_dir_name, element.get_full_name () + ".html");
 	}
 
 	protected override string get_icon_directory () {
@@ -140,7 +140,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 			GLib.FileStream file = GLib.FileStream.open (rpath, "w");
 			writer = new Html.MarkupWriter (file);
 			_renderer.set_writer (writer);
-			write_file_header (css_path, js_path, node.full_name ());
+			write_file_header (css_path, js_path, node.get_full_name ());
 			write_symbol_content (node);
 			write_file_footer ();
 			file = null;
@@ -163,7 +163,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 		GLib.FileStream file = GLib.FileStream.open (rpath, "w");
 		writer = new Html.MarkupWriter (file);
 		_renderer.set_writer (writer);
-		write_file_header (css_path, js_path, node.full_name());
+		write_file_header (css_path, js_path, node.get_full_name());
 		write_symbol_content (node);
 		write_file_footer ();
 		file = null;
diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index 18e56d3..d7afc12 100755
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -42,7 +42,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 	}
 
 	private string get_real_path ( Api.Node element ) {
-		return GLib.Path.build_filename ( this.settings.path, element.package.name, element.full_name () + ".html" );
+		return GLib.Path.build_filename ( this.settings.path, element.package.name, element.get_full_name () + ".html" );
 	}
 
 	public override void process (Settings settings, Api.Tree tree) {
@@ -95,7 +95,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 			GLib.FileStream file = GLib.FileStream.open (rpath, "w");
 			writer = new Html.MarkupWriter (file);
 			_renderer.set_writer (writer);
-			write_file_header (this.css_path, this.js_path, ns.full_name ());
+			write_file_header (this.css_path, this.js_path, ns.get_full_name ());
 			write_navi_symbol (ns);
 			write_namespace_content (ns, ns);
 			write_file_footer ();
@@ -111,7 +111,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 		GLib.FileStream file = GLib.FileStream.open (rpath, "w");
 		writer = new Html.MarkupWriter (file);
 		_renderer.set_writer (writer);
-		write_file_header (css_path, js_path, node.full_name());
+		write_file_header (css_path, js_path, node.get_full_name());
 		if (is_internal_node (node)) {
 			write_navi_symbol (node);
 		} else {
diff --git a/src/doclets/valadoc.org/doclet.vala b/src/doclets/valadoc.org/doclet.vala
index af2dbff..85187d4 100755
--- a/src/doclets/valadoc.org/doclet.vala
+++ b/src/doclets/valadoc.org/doclet.vala
@@ -40,15 +40,15 @@ public class Valadoc.ValadocOrg.Doclet : Valadoc.Html.BasicDoclet {
 	}
 
 	protected override string get_img_path_html (Api.Node element, string type) {
-		return Path.build_filename ("/doc", element.package.name,"img", element.full_name () + "." + type);
+		return Path.build_filename ("/doc", element.package.name,"img", element.get_full_name () + "." + type);
 	}
 
 	private string get_path (Api.Node element) {
-		return element.full_name () + ".html";
+		return element.get_full_name () + ".html";
 	}
 
 	private string get_real_path (Api.Node element, string file_extension) {
-		return GLib.Path.build_filename (this.settings.path, this.package_dir_name, element.full_name () + file_extension);
+		return GLib.Path.build_filename (this.settings.path, this.package_dir_name, element.get_full_name () + file_extension);
 	}
 
 	public override void process (Settings settings, Api.Tree tree) {
diff --git a/src/doclets/xml/xmlrenderer.vala b/src/doclets/xml/xmlrenderer.vala
index 1d8d8e5..ded1574 100755
--- a/src/doclets/xml/xmlrenderer.vala
+++ b/src/doclets/xml/xmlrenderer.vala
@@ -106,7 +106,7 @@ public class Valadoc.Xml.Renderer : ContentRenderer {
 			taglets,
 			(taglet) => {
 				var see = taglet as Taglets.See;
-				_writer.simple_tag ("taglet", {"name", "see", "type", see.symbol.full_name ()});
+				_writer.simple_tag ("taglet", {"name", "see", "type", see.symbol.get_full_name ()});
 			});
 
 		_writer.end_tag ("taglets");
@@ -134,7 +134,7 @@ public class Valadoc.Xml.Renderer : ContentRenderer {
 	}
 
 	public override void visit_symbol_link (SymbolLink element) {
-		_writer.simple_tag ("inline-taglet", {"name", "symbol-link", "type", element.symbol.full_name ()});
+		_writer.simple_tag ("inline-taglet", {"name", "symbol-link", "type", element.symbol.get_full_name ()});
 	}
 
 	public override void visit_list (Content.List element) {
diff --git a/src/libvaladoc/api/class.vala b/src/libvaladoc/api/class.vala
index 7ee2c6a..0ed0fd5 100644
--- a/src/libvaladoc/api/class.vala
+++ b/src/libvaladoc/api/class.vala
@@ -34,7 +34,7 @@ public class Valadoc.Api.Class : TypeSymbol {
 		this.vclass = symbol;
 
 		if (glib_error == null) {
-			if (this.full_name () == "GLib.Error") {
+			if (this.get_full_name () == "GLib.Error") {
 				glib_error = this;
 			}
 		}
diff --git a/src/libvaladoc/api/node.vala b/src/libvaladoc/api/node.vala
index 6e496c9..552694f 100644
--- a/src/libvaladoc/api/node.vala
+++ b/src/libvaladoc/api/node.vala
@@ -240,8 +240,7 @@ public abstract class Valadoc.Api.Node : Item, Visitable, Documentation, Compara
 		get;
 	}
 
-	// rename to get_full_name
-	public string? full_name () {
+	public string? get_full_name () {
 		if (this._full_name == null) {
 			if (this.name == null)
 				return null;
diff --git a/src/libvaladoc/charts/chartfactory.vala b/src/libvaladoc/charts/chartfactory.vala
index 66c1cb4..6a3351a 100644
--- a/src/libvaladoc/charts/chartfactory.vala
+++ b/src/libvaladoc/charts/chartfactory.vala
@@ -23,7 +23,7 @@
 
 public abstract class Valadoc.Charts.Factory : Object {
 	protected Gvc.Node create_type (Gvc.Graph graph, Api.Node item) {
-		return graph.create_node (item.full_name ());
+		return graph.create_node (item.get_full_name ());
 	}
 
 	public abstract Gvc.Graph create_graph (Api.Node item);
diff --git a/src/libvaladoc/charts/simplechartfactory.vala b/src/libvaladoc/charts/simplechartfactory.vala
index 867e454..a1f09fb 100644
--- a/src/libvaladoc/charts/simplechartfactory.vala
+++ b/src/libvaladoc/charts/simplechartfactory.vala
@@ -26,12 +26,12 @@ public class Valadoc.Charts.SimpleFactory : Charts.Factory {
 	protected virtual Gvc.Node configure_type (Gvc.Node node, Api.Node item) {
  		node.safe_set ("shape", "box", "");
 		node.safe_set ("fontname", "Times", "");
-		node.safe_set ("label", item.full_name (), "");
+		node.safe_set ("label", item.get_full_name (), "");
 		return node;
 	}
 
 	public override Gvc.Graph create_graph (Api.Node item) {
-		var graph = new Gvc.Graph (item.full_name (), Gvc.GraphKind.AGDIGRAPH);
+		var graph = new Gvc.Graph (item.get_full_name (), Gvc.GraphKind.AGDIGRAPH);
 		return graph;
 	}
 
diff --git a/src/libvaladoc/html/basicdoclet.vala b/src/libvaladoc/html/basicdoclet.vala
index 7215d50..112bab1 100755
--- a/src/libvaladoc/html/basicdoclet.vala
+++ b/src/libvaladoc/html/basicdoclet.vala
@@ -113,11 +113,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	}
 
 	protected virtual string get_img_path_html (Api.Node element, string type) {
-		return Path.build_filename ("img", element.full_name () + "." + type);
+		return Path.build_filename ("img", element.get_full_name () + "." + type);
 	}
 
 	protected virtual string get_img_path (Api.Node element, string type) {
-		return Path.build_filename (settings.path, element.package.name, "img", element.full_name () + "." + type);
+		return Path.build_filename (settings.path, element.package.name, "img", element.get_full_name () + "." + type);
 	}
 
 	protected virtual string get_icon_directory () {
@@ -142,7 +142,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 		string name;
 
 		if (full_name == true && element is Namespace) {
-			string tmp = element.full_name();
+			string tmp = element.get_full_name();
 			name = (tmp == null)? "Global Namespace" : tmp;
 		} else {
 			string tmp = element.name;
@@ -347,7 +347,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 
 		writer.start_tag ("div", {"class", css_namespace_note});
 		writer.start_tag ("b").text ("Namespace:").end_tag ("b");
-		writer.text (" ").text (ns.full_name());
+		writer.text (" ").text (ns.get_full_name());
 		writer.end_tag ("div");
 	}
 
@@ -512,7 +512,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 	}
 
 	public void write_symbol_content (Api.Node node) {
-		string full_name = node.full_name ();
+		string full_name = node.get_full_name ();
 		writer.start_tag ("div", {"class", css_style_content});
 		writer.start_tag ("h1", {"class", css_title}).text (node.name).end_tag ("h1");
 		writer.simple_tag ("hr", {"class", css_headline_hr});
@@ -667,14 +667,14 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
 
 			writer.start_tag ("h2", {"class", css_title}).text ("Object Hierarchy:").end_tag ("h2");
 
-			writer.simple_tag ("img", {"class", css_diagram, "usemap", "#"+element.full_name (),"alt", "Object hierarchy for %s".printf (element.name), "src", this.get_img_path_html (element, "png")});
+			writer.simple_tag ("img", {"class", css_diagram, "usemap", "#"+element.get_full_name (),"alt", "Object hierarchy for %s".printf (element.name), "src", this.get_img_path_html (element, "png")});
 			writer.add_usemap (chart);
 		}
 	}
 
 	public void write_namespace_content (Namespace node, Api.Node? parent) {
 		writer.start_tag ("div", {"class", css_style_content});
-		writer.start_tag ("h1", {"class", css_title}).text (node.name == null ? "Global Namespace" : node.full_name ()).end_tag ("h1");
+		writer.start_tag ("h1", {"class", css_title}).text (node.name == null ? "Global Namespace" : node.get_full_name ()).end_tag ("h1");
 		writer.simple_tag ("hr", {"class", css_hr});
 		writer.start_tag ("h2", {"class", css_title}).text ("Description:").end_tag ("h2");
 
diff --git a/src/libvaladoc/html/htmlrenderer.vala b/src/libvaladoc/html/htmlrenderer.vala
index 7b6457a..c72c6b3 100755
--- a/src/libvaladoc/html/htmlrenderer.vala
+++ b/src/libvaladoc/html/htmlrenderer.vala
@@ -60,7 +60,7 @@ public class Valadoc.Html.HtmlRenderer : ContentRenderer {
 	private void write_symbol_link (Api.Node symbol, string? label) {
 		var url = get_url (symbol);
 		writer.link (url,
-		             (label == null || label == "") ? symbol.full_name () : label,
+		             (label == null || label == "") ? symbol.get_full_name () : label,
 		             cssresolver.resolve (symbol));
 	}
 
diff --git a/src/libvaladoc/html/linkhelper.vala b/src/libvaladoc/html/linkhelper.vala
index c6c4b4e..16360c0 100644
--- a/src/libvaladoc/html/linkhelper.vala
+++ b/src/libvaladoc/html/linkhelper.vala
@@ -123,9 +123,9 @@ public class Valadoc.Html.LinkHelper : Object {
 		}
 
 		if (from == to.package) {
-			return Path.build_filename (to.full_name () + ".html");
+			return Path.build_filename (to.get_full_name () + ".html");
 		} else {
-			return Path.build_filename ("..", to.package.name, to.full_name () + ".html");
+			return Path.build_filename ("..", to.package.name, to.get_full_name () + ".html");
 		}
 	}
 
@@ -161,9 +161,9 @@ public class Valadoc.Html.LinkHelper : Object {
 		}
 
 		if (from.name == "index.valadoc") {
-			return Path.build_filename (to.package.name, to.full_name() + ".html");
+			return Path.build_filename (to.package.name, to.get_full_name() + ".html");
 		} else {
-			return Path.build_filename ("..", to.package.name, to.full_name() + ".html");
+			return Path.build_filename ("..", to.package.name, to.get_full_name() + ".html");
 		}
 	}
 
@@ -195,9 +195,9 @@ public class Valadoc.Html.LinkHelper : Object {
 		}
 
 		if (from.package == to.package) {
-			return Path.build_filename (to.full_name() + ".html");
+			return Path.build_filename (to.get_full_name() + ".html");
 		} else {
-			return Path.build_filename ("..", to.package.name, to.full_name() + ".html");
+			return Path.build_filename ("..", to.package.name, to.get_full_name() + ".html");
 		}
 	}
  }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]