Author: scottbw
Date: Wed Sep 8 16:06:31 2010
New Revision: 995111
URL: http://svn.apache.org/viewvc?rev=995111&view=rev
Log:
Modified the parser to model the Author as a localizable object with an
optional its:dir property - see WOOKIE-119. This also affects the API the
parser exposes to the Wookie server. I haven't changed the model managed by the
server itself however, only the classes that map from the parser model to beans
used by the server (WidgetFactory, GadgetAdaptor).
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/IAuthorEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/W3CWidget.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/WidgetManifestModel.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetAdapter.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java?rev=995111&r1=995110&r2=995111&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/EntityTest.java
Wed Sep 8 16:06:31 2010
@@ -149,14 +149,12 @@ public class EntityTest {
@Test
public void widget() throws JDOMException, IOException,
BadManifestException{
WidgetManifestModel widget = new WidgetManifestModel("<widget
xmlns=\""+IW3CXMLConfiguration.MANIFEST_NAMESPACE+"\"><name>test</name></widget>",null,null,null,null);
- assertNull(widget.getAuthorEmail());
- assertNull(widget.getAuthorHref());
+ assertNull(widget.getAuthor());
assertEquals("test",widget.getLocalName("en"));
assertEquals("floating",widget.getViewModes());
widget = new WidgetManifestModel("<widget
xmlns=\""+IW3CXMLConfiguration.MANIFEST_NAMESPACE+"\"
viewmodes=\"fullscreen\"></widget>",null,null,null,null);
- assertNull(widget.getAuthorEmail());
- assertNull(widget.getAuthorHref());
+ assertNull(widget.getAuthor());
assertEquals(IW3CXMLConfiguration.UNKNOWN,widget.getLocalName("en"));
assertEquals("fullscreen",widget.getViewModes());
}
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java?rev=995111&r1=995110&r2=995111&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/PackagingAndConfiguration.java
Wed Sep 8 16:06:31 2010
@@ -197,7 +197,7 @@ public class PackagingAndConfiguration e
@Test
public void bw(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-klLDaEgJeU/003/bw.wgt";);
- assertEquals("PASS", widget.getAuthor());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
}
// 9 widget
@Test
@@ -647,18 +647,18 @@ public class PackagingAndConfiguration e
@Test
public void b7(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-sdwhMozwIc/000/b7.wgt";);
- assertEquals("PASS", widget.getAuthor());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
}
@Test
public void b8(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-sdwhMozwIc/001/b8.wgt";);
- assertEquals("", widget.getAuthor());
+ assertEquals("", widget.getAuthor().getAuthorName());
}
@Test
public void b9(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-sdwhMozwIc/002/b9.wgt";);
- assertEquals("PASS", widget.getAuthor());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
}
@@ -666,49 +666,50 @@ public class PackagingAndConfiguration e
@Test
public void af(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/000/af.wgt";);
- assertEquals("PASS", widget.getAuthor());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
}
@Test
public void ag(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/001/ag.wgt";);
- assertEquals("P A S S", widget.getAuthor());
+ assertEquals("P A S S", widget.getAuthor().getAuthorName());
}
@Test
public void ah(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/002/ah.wgt";);
- assertEquals("PASS", widget.getAuthor());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
}
@Test
public void ai(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/003/ai.wgt";);
- assertEquals("PASS", widget.getAuthorEmail());
+ assertEquals("PASS", widget.getAuthor().getEmail());
}
@Test
public void aj(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/004/aj.wgt";);
- assertEquals("PASS", widget.getAuthor());
- assertEquals("PASS", widget.getAuthorEmail());
- assertEquals("PASS:PASS", widget.getAuthorHref());
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
+ assertEquals("PASS", widget.getAuthor().getEmail());
+ assertEquals("PASS:PASS", widget.getAuthor().getHref());
}
@Test
public void ak(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/005/ak.wgt";);
- assertEquals("PASS", widget.getAuthor());
- assertEquals("PASS", widget.getAuthorEmail());
- assertEquals("PASS:PASS", widget.getAuthorHref()); }
+ assertEquals("PASS", widget.getAuthor().getAuthorName());
+ assertEquals("PASS", widget.getAuthor().getEmail());
+ assertEquals("PASS:PASS", widget.getAuthor().getHref());
+ }
@Test
public void al(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/006/al.wgt";);
- assertEquals("", widget.getAuthor());
+ assertEquals("", widget.getAuthor().getAuthorName());
}
@Test
public void am(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/007/am.wgt";);
- assertEquals("PASS:PASS", widget.getAuthorHref()); }
+ assertEquals("PASS:PASS", widget.getAuthor().getHref());
}
@Test
public void an(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-argMozRiC/008/an.wgt";);
- assertEquals(null, widget.getAuthorHref()); }
+ assertEquals(null, widget.getAuthor().getHref()); }
// 28 Preference
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=995111&r1=995110&r2=995111&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
Wed Sep 8 16:06:31 2010
@@ -17,7 +17,7 @@ package org.apache.wookie.w3c;
/**
* an Author of a Widget
*/
-public interface IAuthorEntity extends IElement {
+public interface IAuthorEntity extends ILocalizedEntity {
public String getAuthorName();
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=995111&r1=995110&r2=995111&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
Wed Sep 8 16:06:31 2010
@@ -63,15 +63,7 @@ public interface W3CWidget extends IElem
/**
* Get the Author information for the widget
*/
- public String getAuthor();
- /**
- * Get the email address of the Widget's author
- */
- public String getAuthorEmail();
- /**
- * Get the url for the Widget's author
- */
- public String getAuthorHref();
+ public IAuthorEntity getAuthor();
/**
* Get the list of Preferences defined for the widget
*/
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=995111&r1=995110&r2=995111&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
Wed Sep 8 16:06:31 2010
@@ -67,6 +67,7 @@ public class AuthorEntity extends Abstra
}
public void fromXML(Element element) {
+ super.fromXML(element);
fAuthorName = getLocalizedTextContent(element);
fHref =
UnicodeUtils.normalizeSpaces(element.getAttributeValue(IW3CXMLConfiguration.HREF_ATTRIBUTE));
if (fHref.equals("")) fHref = null;
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=995111&r1=995110&r2=995111&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
Wed Sep 8 16:06:31 2010
@@ -162,19 +162,8 @@ public class WidgetManifestModel impleme
return fAccessList;
}
- public String getAuthor(){
- if (fAuthor == null) return null;
- return fAuthor.getAuthorName();
- }
-
- public String getAuthorEmail() {
- if (fAuthor == null) return null;
- return fAuthor.getEmail();
- }
-
- public String getAuthorHref() {
- if (fAuthor == null) return null;
- return fAuthor.getHref();
+ public IAuthorEntity getAuthor(){
+ return fAuthor;
}
public List<IContentEntity> getContentList() {
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java?rev=995111&r1=995110&r2=995111&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Wed
Sep 8 16:06:31 2010
@@ -101,10 +101,12 @@ public class WidgetFactory {
private static IWidget createWidget(IPersistenceManager
persistenceManager, W3CWidget model){
IWidget widget;
- widget = persistenceManager.newInstance(IWidget.class);
- widget.setWidgetAuthor(model.getAuthor());
- widget.setWidgetAuthorEmail(model.getAuthorEmail());
- widget.setWidgetAuthorHref(model.getAuthorHref());
+ widget = persistenceManager.newInstance(IWidget.class);
+ if (model.getAuthor() != null){
+
widget.setWidgetAuthor(model.getAuthor().getAuthorName());
+
widget.setWidgetAuthorEmail(model.getAuthor().getEmail());
+ widget.setWidgetAuthorHref(model.getAuthor().getHref());
+ }
widget.setGuid(model.getIdentifier());
widget.setHeight(model.getHeight());
widget.setWidth(model.getWidth());
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetAdapter.java?rev=995111&r1=995110&r2=995111&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetAdapter.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetAdapter.java
Wed Sep 8 16:06:31 2010
@@ -151,19 +151,8 @@ public class GadgetAdapter implements W3
}
- public String getAuthor(){
- if (fAuthor == null) return null;
- return fAuthor.getAuthorName();
- }
-
- public String getAuthorEmail() {
- if (fAuthor == null) return null;
- return fAuthor.getEmail();
- }
-
- public String getAuthorHref() {
- if (fAuthor == null) return null;
- return fAuthor.getHref();
+ public IAuthorEntity getAuthor(){
+ return fAuthor;
}
public List<IContentEntity> getContentList() {
