You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2009/12/14 12:27:01 UTC
svn commit: r890276 -
/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
Author: scottbw
Date: Mon Dec 14 11:27:01 2009
New Revision: 890276
URL: http://svn.apache.org/viewvc?rev=890276&view=rev
Log:
Omit empty values for short name and author in XML output (i.e. don't print "null" as a string)
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java?rev=890276&r1=890275&r2=890276&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java Mon Dec 14 11:27:01 2009
@@ -82,7 +82,9 @@
+"\" height=\"" + height
+ "\" version=\"" + widget.getVersion()
+ "\">\n";
- out += "\t\t<title short=\""+widget.getWidgetShortName()+"\">" + widget.getWidgetTitle() + "</title>\n";
+ out += "\t\t<title ";
+ if (widget.getWidgetShortName() != null) out +="short=\""+widget.getWidgetShortName() + "\"";
+ out +=">" + widget.getWidgetTitle() + "</title>\n";
out += "\t\t<description>" + widget.getWidgetDescription()
+ "</description>\n";
@@ -116,7 +118,9 @@
out += "\t\t<author";
if (widget.getWidgetAuthorEmail() != null) out+= " email=\""+widget.getWidgetAuthorEmail()+"\"";
if (widget.getWidgetAuthorHref() != null) out+= " href=\""+widget.getWidgetAuthorHref()+"\"";
- out += ">"+widget.getWidgetAuthor()+"</author>\n";
+ out += ">";
+ if (widget.getWidgetAuthor()!=null) out += widget.getWidgetAuthor();
+ out += "</author>\n";
// Do license
License[] licenses = License.findByValue("widget", widget);
@@ -127,8 +131,6 @@
if (license.getDir()!=null) out+=" its:dir=\""+license.getDir()+"\"";
out+=">"+license.getText()+"</license>\n";
}
-
- // TODO features
// Do preference defaults
PreferenceDefault[] prefs = PreferenceDefault.findByValue("widget",widget);