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:35:48 UTC
svn commit: r890280 -
/incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java
Author: scottbw
Date: Mon Dec 14 11:35:48 2009
New Revision: 890280
URL: http://svn.apache.org/viewvc?rev=890280&view=rev
Log:
Changed the default Shortname and Version to be returned as Null rather than to use special Wookie defaults, as this is the expected behaviour in the W3C spec.
Modified:
incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java?rev=890280&r1=890279&r2=890280&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/manifestmodel/impl/WidgetManifestModel.java Mon Dec 14 11:35:48 2009
@@ -200,8 +200,8 @@
public String getLocalShortName(String locale){
INameEntity name = getLocalNameEntity(locale);
- if (name != null) return name.getShort();
- return IW3CXMLConfiguration.UNKNOWN;
+ if (name == null) return null;
+ return name.getShort();
}
private INameEntity getLocalNameEntity(String locale){
@@ -305,13 +305,8 @@
fIdentifier = "generated-uid-" + r.toString();
}
// VERSION IS OPTIONAL
- fVersion = element.getAttributeValue(IW3CXMLConfiguration.VERSION_ATTRIBUTE);
- if(fVersion == null){
- // give up
- fVersion = IW3CXMLConfiguration.DEFAULT_WIDGET_VERSION;
- } else {
- fVersion = UnicodeUtils.normalizeSpaces(fVersion);
- }
+ fVersion = UnicodeUtils.normalizeSpaces(element.getAttributeValue(IW3CXMLConfiguration.VERSION_ATTRIBUTE));
+
// HEIGHT IS OPTIONAL
String height = element.getAttributeValue(IW3CXMLConfiguration.HEIGHT_ATTRIBUTE);
if(height != null){