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 2010/04/20 01:00:35 UTC
svn commit: r935765 - in
/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c: ./ impl/ util/
Author: scottbw
Date: Mon Apr 19 23:00:34 2010
New Revision: 935765
URL: http://svn.apache.org/viewvc?rev=935765&view=rev
Log:
Tidied up the Parser API and fixed some small niggles:
1. removed getXMLTagName() method as this is never used, even internally
2. added more javadoc in lots of places
3. removed unused ILocalizedEntity.setLang (it is only referenced directly from AbstractLocalizedEntity)
4. renamed "IManifestModelBase" to "IElement" as I think it fits the overall naming scheme better
5. added missing ASF license header to IStartPageProcessor
6. used a StringBuffer instead of inefficient looping over and concatenating strings in AbstractLocalizedEntity
7. fixed a potential gotcha with a missing return value assignment in WidgetPackageUtils.convertIdToFolderName
(NB 6&7 were spotted by the FindBugs Eclipse plugin; 1&3 showed up when running the EclEmma code coverage Eclipse plugin)
Added:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IElement.java
- copied, changed from r920825, incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IManifestModelBase.java
Removed:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IManifestModelBase.java
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IContentEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IDescriptionEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IFeatureEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IIconEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILicenseEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedElement.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/INameEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IParamEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IPreferenceEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IStartPageProcessor.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AuthorEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ContentEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/DescriptionEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/IconEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/LicenseEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/NameEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ParamEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/PreferenceEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAccessEntity.java Mon Apr 19 23:00:34 2010
@@ -14,10 +14,9 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: IAccessEntity.java,v 1.3 2009-09-02 18:37:31 scottwilson Exp $
+ * a Widget Access Request Policy (WARP) element
*/
-public interface IAccessEntity extends IManifestModelBase {
+public interface IAccessEntity extends IElement {
public String getOrigin();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java Mon Apr 19 23:00:34 2010
@@ -13,11 +13,11 @@
*/
package org.apache.wookie.w3c;
+
/**
- * @author Paul Sharples
- * @version $Id: IAuthorEntity.java,v 1.3 2009-09-02 18:37:30 scottwilson Exp $
+ * an Author of a Widget
*/
-public interface IAuthorEntity extends IManifestModelBase {
+public interface IAuthorEntity extends IElement {
public String getAuthorName();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IContentEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IContentEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IContentEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IContentEntity.java Mon Apr 19 23:00:34 2010
@@ -19,8 +19,7 @@ import org.apache.wookie.w3c.exceptions.
import org.jdom.Element;
/**
- * @author Paul Sharples
- * @version $Id: IContentEntity.java,v 1.3 2009-09-02 18:37:31 scottwilson Exp $
+ * A Widget Start Page
*/
public interface IContentEntity extends ILocalizedEntity {
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IDescriptionEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IDescriptionEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IDescriptionEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IDescriptionEntity.java Mon Apr 19 23:00:34 2010
@@ -14,8 +14,7 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: IDescriptionEntity.java,v 1.3 2009-09-02 18:37:30 scottwilson Exp $
+ * a Description of a Widget
*/
public interface IDescriptionEntity extends ILocalizedEntity {
Copied: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IElement.java (from r920825, incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IManifestModelBase.java)
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IElement.java?p2=incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IElement.java&p1=incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IManifestModelBase.java&r1=920825&r2=935765&rev=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IManifestModelBase.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IElement.java Mon Apr 19 23:00:34 2010
@@ -16,10 +16,10 @@ package org.apache.wookie.w3c;
import org.apache.wookie.w3c.exceptions.BadManifestException;
import org.jdom.Element;
-public interface IManifestModelBase {
-
-
- public String getXMLTagName();
+/**
+ * Base class for model objects that are unmarshalled from an XML element
+ */
+public interface IElement {
/**
* Unmarshall the given XML Element to this Object
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IFeatureEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IFeatureEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IFeatureEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IFeatureEntity.java Mon Apr 19 23:00:34 2010
@@ -14,12 +14,11 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: IFeatureEntity.java,v 1.3 2009-09-02 18:37:30 scottwilson Exp $
+ * a Feature of a Widget
*/
import java.util.List;
-public interface IFeatureEntity extends IManifestModelBase {
+public interface IFeatureEntity extends IElement {
public String getName();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IIconEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IIconEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IIconEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IIconEntity.java Mon Apr 19 23:00:34 2010
@@ -19,8 +19,7 @@ import org.apache.wookie.w3c.exceptions.
import org.jdom.Element;
/**
- * @author Paul Sharples
- * @version $Id: IIconEntity.java,v 1.3 2009-09-02 18:37:31 scottwilson Exp $
+ * a Widget icon
*/
public interface IIconEntity extends ILocalizedEntity {
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILicenseEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILicenseEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILicenseEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILicenseEntity.java Mon Apr 19 23:00:34 2010
@@ -14,8 +14,7 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: ILicenseEntity.java,v 1.3 2009-09-02 18:37:30 scottwilson Exp $
+ * a License for a Widget
*/
public interface ILicenseEntity extends ILocalizedEntity {
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedElement.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedElement.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedElement.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedElement.java Mon Apr 19 23:00:34 2010
@@ -15,14 +15,13 @@ package org.apache.wookie.w3c;
/**
* An element that can be localized by language tag
- * @author scott
- *
+ * @see ILocalizedEntity
*/
public interface ILocalizedElement {
/**
* Get the language tag for the element. This should conform to BCP47.
- * @return
+ * @return the language tag, or null if no language tag has been set for the element
*/
public String getLang();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/ILocalizedEntity.java Mon Apr 19 23:00:34 2010
@@ -13,13 +13,22 @@
*/
package org.apache.wookie.w3c;
+/**
+ * An element that supports localization with both a language tag and text direction
+ */
+public interface ILocalizedEntity extends IElement, ILocalizedElement {
-public interface ILocalizedEntity extends IManifestModelBase, ILocalizedElement {
-
- public void setLang(String language);
-
+ /**
+ * Get the direction of text, which can be one of "ltr", "rtl", "lro", or "rlo". The default value is "ltr".
+ * @return the direction of the text
+ */
public String getDir();
+ /**
+ * Checks whether this object has valid localization settings; specifically that the lang property of this
+ * object is a valid language-tag according to BCP-47
+ * @return true if the locale for this object is aeither valid language tag or null, otherwise false.
+ */
public boolean isValid();
}
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/INameEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/INameEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/INameEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/INameEntity.java Mon Apr 19 23:00:34 2010
@@ -14,8 +14,7 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: INameEntity.java,v 1.3 2009-09-02 18:37:31 scottwilson Exp $
+ * a Name of a Widget
*/
public interface INameEntity extends ILocalizedEntity {
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IParamEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IParamEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IParamEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IParamEntity.java Mon Apr 19 23:00:34 2010
@@ -14,10 +14,9 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: IParamEntity.java,v 1.3 2009-09-02 18:37:31 scottwilson Exp $
+ * a Parameter of a Preference or Feature for a Widget
*/
-public interface IParamEntity extends IManifestModelBase {
+public interface IParamEntity extends IElement {
public String getName();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IPreferenceEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IPreferenceEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IPreferenceEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IPreferenceEntity.java Mon Apr 19 23:00:34 2010
@@ -14,10 +14,9 @@
package org.apache.wookie.w3c;
/**
- * @author Paul Sharples
- * @version $Id: IPreferenceEntity.java,v 1.3 2009-09-02 18:37:30 scottwilson Exp $
+ * a Preference for a Widget
*/
-public interface IPreferenceEntity extends IParamEntity, IManifestModelBase {
+public interface IPreferenceEntity extends IParamEntity, IElement {
public boolean isReadOnly();
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IStartPageProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IStartPageProcessor.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IStartPageProcessor.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IStartPageProcessor.java Mon Apr 19 23:00:34 2010
@@ -1,3 +1,16 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.wookie.w3c;
import java.io.File;
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IW3CXMLConfiguration.java Mon Apr 19 23:00:34 2010
@@ -16,9 +16,6 @@ package org.apache.wookie.w3c;
/**
* Constants for widget elements found in the config.xml file
- *
- * @author Paul Sharples
- * @version $Id: IW3CXMLConfiguration.java,v 1.2 2009-07-28 16:05:22 scottwilson Exp $
*/
public interface IW3CXMLConfiguration {
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.java Mon Apr 19 23:00:34 2010
@@ -22,7 +22,7 @@ import java.util.List;
* This represents the information model for a W3C widget that has been
* unpacked using the W3CWidgetFactory.
*/
-public interface W3CWidget extends IManifestModelBase{
+public interface W3CWidget extends IElement{
/**
* Get the list of access request entities for the widget
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AbstractLocalizedEntity.java Mon Apr 19 23:00:34 2010
@@ -41,12 +41,19 @@ public abstract class AbstractLocalizedE
public String getLang() {
return lang;
}
+
+ /**
+ * Set the language tag for the object
+ * @param language the language tag to set; this should be a valid BCP-47 language tag
+ */
public void setLang(String lang) {
this.lang = lang;
}
+
public String getDir() {
return dir;
}
+
public void setDir(String dir) {
this.dir = dir;
}
@@ -78,25 +85,25 @@ public abstract class AbstractLocalizedE
* @return a string containing the element text
*/
public static String getLocalizedTextContent(Element element){
- String content = "";
+ StringBuffer content = new StringBuffer();
for (Object node:element.getContent()){
if (node instanceof Element){
if ((((Element) node).getAttribute("dir")!= null || ((Element) node).getAttribute("lang")!= null) && ((Element)node).getName().equals("span")){
- content += "<span dir=\""+getTextDirection((Element)node)+"\"";
+ content.append("<span dir=\""+getTextDirection((Element)node)+"\"");
if (((Element)node).getAttribute("lang")!=null)
- content += " xml:lang=\""+((Element)node).getAttribute("lang").getValue()+"\"";
- content +=">";
- content += getLocalizedTextContent((Element)node);
- content += "</span>";
+ content.append(" xml:lang=\""+((Element)node).getAttribute("lang").getValue()+"\"");
+ content.append(">");
+ content.append(getLocalizedTextContent((Element)node));
+ content.append("</span>");
} else {
- content += getLocalizedTextContent((Element)node);
+ content.append(getLocalizedTextContent((Element)node));
}
}
if (node instanceof Text){
- content += ((Text)node).getText();
+ content.append(((Text)node).getText());
}
}
- return UnicodeUtils.normalizeWhitespace(content);
+ return UnicodeUtils.normalizeWhitespace(content.toString());
}
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AccessEntity.java Mon Apr 19 23:00:34 2010
@@ -53,9 +53,6 @@ public class AccessEntity implements IAc
public void setSubDomains(boolean subDomains) {
fSubDomains = subDomains;
}
- public String getXMLTagName() {
- return IW3CXMLConfiguration.ACCESS_ELEMENT;
- }
public void fromXML(Element element) {
// Origin is required
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AuthorEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AuthorEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AuthorEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/AuthorEntity.java Mon Apr 19 23:00:34 2010
@@ -66,10 +66,6 @@ public class AuthorEntity extends Abstra
fEmail = email;
}
- public String getXMLTagName() {
- return IW3CXMLConfiguration.AUTHOR_ELEMENT;
- }
-
public void fromXML(Element element) {
fAuthorName = getLocalizedTextContent(element);
fHref = UnicodeUtils.normalizeSpaces(element.getAttributeValue(IW3CXMLConfiguration.HREF_ATTRIBUTE));
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ContentEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ContentEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ContentEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ContentEntity.java Mon Apr 19 23:00:34 2010
@@ -69,10 +69,6 @@ public class ContentEntity extends Abstr
fType = type;
}
- public String getXMLTagName() {
- return IW3CXMLConfiguration.CONTENT_ELEMENT;
- }
-
public void fromXML(Element element){
}
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/DescriptionEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/DescriptionEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/DescriptionEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/DescriptionEntity.java Mon Apr 19 23:00:34 2010
@@ -43,10 +43,6 @@ public class DescriptionEntity extends A
fDescription = description;
}
- public String getXMLTagName() {
- return IW3CXMLConfiguration.DESCRIPTION_ELEMENT;
- }
-
public void fromXML(Element element) {
super.fromXML(element);
fDescription = getLocalizedTextContent(element);
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java Mon Apr 19 23:00:34 2010
@@ -87,10 +87,6 @@ public class FeatureEntity implements IF
public void setParams(List<IParamEntity> params) {
fParams = params;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.FEATURE_ELEMENT;
- }
public void fromXML(Element element) throws BadManifestException {
fName = UnicodeUtils.normalizeSpaces(element.getAttributeValue(IW3CXMLConfiguration.NAME_ATTRIBUTE));
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/IconEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/IconEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/IconEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/IconEntity.java Mon Apr 19 23:00:34 2010
@@ -64,10 +64,6 @@ public class IconEntity extends Abstract
public void setWidth(Integer width) {
fWidth = width;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.ICON_ELEMENT;
- }
public void fromXML(Element element){
}
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/LicenseEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/LicenseEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/LicenseEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/LicenseEntity.java Mon Apr 19 23:00:34 2010
@@ -54,10 +54,6 @@ public class LicenseEntity extends Abstr
public void setHref(String href) {
fHref = href;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.LICENSE_ELEMENT;
- }
public void fromXML(Element element) {
super.fromXML(element);
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/NameEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/NameEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/NameEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/NameEntity.java Mon Apr 19 23:00:34 2010
@@ -57,10 +57,6 @@ public class NameEntity extends Abstract
fShort = short1;
}
- public String getXMLTagName() {
- return IW3CXMLConfiguration.NAME_ELEMENT;
- }
-
public void fromXML(Element element) {
super.fromXML(element);
// Get the text value of name
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ParamEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ParamEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ParamEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/ParamEntity.java Mon Apr 19 23:00:34 2010
@@ -54,10 +54,6 @@ public class ParamEntity implements IPar
public void setValue(String value) {
fValue = value;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.PARAM_ELEMENT;
- }
public void fromXML(Element element) throws BadManifestException {
fName = UnicodeUtils.normalizeSpaces(element.getAttributeValue(IW3CXMLConfiguration.NAME_ATTRIBUTE));
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/PreferenceEntity.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/PreferenceEntity.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/PreferenceEntity.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/PreferenceEntity.java Mon Apr 19 23:00:34 2010
@@ -39,10 +39,6 @@ public class PreferenceEntity extends Pa
public void setReadOnly(boolean readOnly) {
fReadOnly = readOnly;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.PREFERENCE_ELEMENT;
- }
public void fromXML(Element element) throws BadManifestException {
super.fromXML(element);
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/WidgetManifestModel.java Mon Apr 19 23:00:34 2010
@@ -238,10 +238,6 @@ public class WidgetManifestModel impleme
public Integer getWidth() {
return fWidth;
}
-
- public String getXMLTagName() {
- return IW3CXMLConfiguration.WIDGET_ELEMENT;
- }
public void fromXML(Element element) throws BadManifestException{
fLogger.warn("WidgetManifestModel.fromXML() called with no locales");
Modified: incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java?rev=935765&r1=935764&r2=935765&view=diff
==============================================================================
--- incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java (original)
+++ incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java Mon Apr 19 23:00:34 2010
@@ -138,7 +138,7 @@ public class WidgetPackageUtils {
if(folder.startsWith("http://")){ //$NON-NLS-1$
folder = folder.substring(7, folder.length());
}
- folder.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ folder = folder.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
return folder;
}