Author: scottbw
Date: Fri Jun 8 13:23:09 2012
New Revision: 1348060
URL: http://svn.apache.org/viewvc?rev=1348060&view=rev
Log:
Harmonized the IFeature and IFeatureEntity interfaces (added setters to
IFeatureEntity, changed Params to Parameters, and use List instead of
Collection for child parameter object methods). See WOOKIE-345
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/I18n.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/IFeatureEntity.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/impl/FeatureEntity.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java
incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
incubator/wookie/trunk/src/org/apache/wookie/feature/oauth/oAuthClient.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.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=1348060&r1=1348059&r2=1348060&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
Fri Jun 8 13:23:09 2012
@@ -100,8 +100,8 @@ public class EntityTest {
params.add(param2);
assertEquals("name2", param2.getName());
assertEquals("value2", param2.getValue());
- feature.setParams(params);
- assertEquals(2,feature.getParams().size());
+ feature.setParameters(params);
+ assertEquals(2,feature.getParameters().size());
}
@Test
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/I18n.java
Fri Jun 8 13:23:09 2012
@@ -387,21 +387,21 @@ public class I18n extends ConformanceTes
W3CWidget widget;
widget = getWidget("031","lro");
- assertEquals("×פ×××ק",
widget.getFeatures().get(0).getParams().get(0).getName());
+ assertEquals("×פ×××ק",
widget.getFeatures().get(0).getParameters().get(0).getName());
widget = getWidget("032","lro");
- assertEquals("×פ×××ק",
widget.getFeatures().get(0).getParams().get(0).getValue());
+ assertEquals("×פ×××ק",
widget.getFeatures().get(0).getParameters().get(0).getValue());
widget = getWidget("031","ltr");
- assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParams().get(0).getName());
+ assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParameters().get(0).getName());
widget = getWidget("032","ltr");
- assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParams().get(0).getValue());
+ assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParameters().get(0).getValue());
widget = getWidget("031","rtl");
- assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParams().get(0).getName());
+ assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParameters().get(0).getName());
widget = getWidget("032","rtl");
- assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParams().get(0).getValue());
+ assertEquals("The arrow should point right -->",
widget.getFeatures().get(0).getParameters().get(0).getValue());
widget = getWidget("031","rlo");
- assertEquals("PASSED",
widget.getFeatures().get(0).getParams().get(0).getName());
+ assertEquals("PASSED",
widget.getFeatures().get(0).getParameters().get(0).getName());
widget = getWidget("032","rlo");
- assertEquals("PASSED",
widget.getFeatures().get(0).getParams().get(0).getValue());
+ assertEquals("PASSED",
widget.getFeatures().get(0).getParameters().get(0).getValue());
}
// Utilities
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=1348060&r1=1348059&r2=1348060&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
Fri Jun 8 13:23:09 2012
@@ -993,7 +993,7 @@ public class PackagingAndConfiguration e
@Test
public void e1(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-KNiLPOKdgQ/000/e1.wgt";);
- assertEquals(0,getTestFeature(widget).getParams().size());
+ assertEquals(0,getTestFeature(widget).getParameters().size());
}
// ta-rZdcMBExBX
@@ -1018,13 +1018,13 @@ public class PackagingAndConfiguration e
IFeatureEntity feature2 = widget.getFeatures().get(1);
assertEquals("feature:a9bb79c1", feature1.getName());
assertEquals("feature:a9bb79c1", feature2.getName());
- assertEquals(1,feature1.getParams().size());
- assertEquals(1,feature2.getParams().size());
- assertEquals("test",feature1.getParams().get(0).getName());
- assertEquals("test",feature2.getParams().get(0).getName());
+ assertEquals(1,feature1.getParameters().size());
+ assertEquals(1,feature2.getParameters().size());
+ assertEquals("test",feature1.getParameters().get(0).getName());
+ assertEquals("test",feature2.getParameters().get(0).getName());
assertTrue(
- feature1.getParams().get(0).getValue().equals("pass1")
&& feature2.getParams().get(0).getValue().equals("pass2")
- || feature2.getParams().get(0).getValue().equals("pass1") &&
feature1.getParams().get(0).getValue().equals("pass2")
+
feature1.getParameters().get(0).getValue().equals("pass1") &&
feature2.getParameters().get(0).getValue().equals("pass2")
+ || feature2.getParameters().get(0).getValue().equals("pass1")
&& feature1.getParameters().get(0).getValue().equals("pass2")
);
}
@@ -1059,15 +1059,15 @@ public class PackagingAndConfiguration e
@Test
public void dt(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-EGkPfzCBOz/000/dt.wgt";);
- assertEquals(0,getTestFeature(widget).getParams().size());
+ assertEquals(0,getTestFeature(widget).getParameters().size());
}
@Test
public void dg(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-EGkPfzCBOz/001/dg.wgt";);
assertEquals(1,widget.getFeatures().size());
- assertEquals(1,widget.getFeatures().get(0).getParams().size());
- assertEquals("PASS",
getTestFeature(widget).getParams().get(0).getName());
- assertEquals("PASS",
getTestFeature(widget).getParams().get(0).getValue());
+
assertEquals(1,widget.getFeatures().get(0).getParameters().size());
+ assertEquals("PASS",
getTestFeature(widget).getParameters().get(0).getName());
+ assertEquals("PASS",
getTestFeature(widget).getParameters().get(0).getValue());
}
@Test
public void v9(){
@@ -1075,9 +1075,9 @@ public class PackagingAndConfiguration e
assertEquals(1,widget.getFeatures().size());
IFeatureEntity feature1 = widget.getFeatures().get(0);
assertEquals("feature:a9bb79c1", feature1.getName());
- assertEquals(2,feature1.getParams().size());
- IParamEntity param1 = feature1.getParams().get(0);
- IParamEntity param2 = feature1.getParams().get(1);
+ assertEquals(2,feature1.getParameters().size());
+ IParamEntity param1 = feature1.getParameters().get(0);
+ IParamEntity param2 = feature1.getParameters().get(1);
assertEquals("PASS",param1.getName());
assertEquals("PASS",param2.getName());
assertTrue(
@@ -1089,7 +1089,7 @@ public class PackagingAndConfiguration e
@Test
public void d6(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-xlgUWUVzCY/000/d6.wgt";);
- assertEquals(0,getTestFeature(widget).getParams().size());
+ assertEquals(0,getTestFeature(widget).getParameters().size());
}
// ta-CEGwkNQcWo
@@ -1097,13 +1097,13 @@ public class PackagingAndConfiguration e
public void e2(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-CEGwkNQcWo/000/e2.wgt";);
assertNotNull(getTestFeature(widget));
- assertEquals(0,getTestFeature(widget).getParams().size());
+ assertEquals(0,getTestFeature(widget).getParameters().size());
}
@Test
public void e3(){
W3CWidget widget =
processWidgetNoErrors("http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-CEGwkNQcWo/001/e3.wgt";);
assertNotNull(getTestFeature(widget));
- assertEquals(0,getTestFeature(widget).getParams().size());
+ assertEquals(0,getTestFeature(widget).getParameters().size());
}
// ta-bbbbbbbbbb
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=1348060&r1=1348059&r2=1348060&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
Fri Jun 8 13:23:09 2012
@@ -19,11 +19,47 @@ package org.apache.wookie.w3c;
import java.util.List;
public interface IFeatureEntity extends IElement {
+
+ /**
+ * Get widget feature name.
+ *
+ * @return feature name
+ */
+ String getName();
+
+ /**
+ * Set widget feature name.
+ *
+ * @param name feature name
+ */
+ void setName(String name);
+
+ /**
+ * Get widget feature required flag.
+ *
+ * @return required flag
+ */
+ boolean isRequired();
+
+ /**
+ * Set widget feature required flag.
+ *
+ * @param required required flag
+ */
+ void setRequired(boolean required);
- public String getName();
+ /**
+ * Get collection of widget feature parameters.
+ *
+ * @return parameters collection
+ */
+ List<IParamEntity> getParameters();
- public boolean isRequired();
-
- public List<IParamEntity> getParams();
+ /**
+ * Set collection of widget feature parameters.
+ *
+ * @param parameters parameters collection
+ */
+ void setParameters(List<IParamEntity> parameters);
}
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=1348060&r1=1348059&r2=1348060&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
Fri Jun 8 13:23:09 2012
@@ -80,11 +80,11 @@ public class FeatureEntity implements IF
fRequired = required;
}
- public List<IParamEntity> getParams() {
+ public List<IParamEntity> getParameters() {
return fParams;
}
- public void setParams(List<IParamEntity> params) {
+ public void setParameters(List<IParamEntity> params) {
fParams = params;
}
@@ -140,7 +140,7 @@ public class FeatureEntity implements IF
Element element = new
Element(IW3CXMLConfiguration.FEATURE_ELEMENT,
IW3CXMLConfiguration.MANIFEST_NAMESPACE);
element.setAttribute(IW3CXMLConfiguration.NAME_ATTRIBUTE,
getName());
element.setAttribute(IW3CXMLConfiguration.REQUIRED_ATTRIBUTE,
String.valueOf(isRequired()));
- for (IParamEntity param: getParams()){
+ for (IParamEntity param: getParameters()){
element.addContent(param.toXml());
}
return element;
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IFeature.java Fri Jun 8
13:23:09 2012
@@ -14,7 +14,7 @@
package org.apache.wookie.beans;
-import java.util.Collection;
+import java.util.List;
/**
* IFeature - a widget feature found in the config.xml.
@@ -30,14 +30,14 @@ public interface IFeature
*
* @return feature name
*/
- String getFeatureName();
+ String getName();
/**
* Set widget feature name.
*
* @param featureName feature name
*/
- void setFeatureName(String featureName);
+ void setName(String featureName);
/**
* Get widget feature required flag.
@@ -58,12 +58,12 @@ public interface IFeature
*
* @return parameters collection
*/
- Collection<IParam> getParameters();
+ List<IParam> getParameters();
/**
* Set collection of widget feature parameters.
*
* @param parameters parameters collection
*/
- void setParameters(Collection<IParam> parameters);
+ void setParameters(List<IParam> parameters);
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/ILocalizedBean.java Fri
Jun 8 13:23:09 2012
@@ -25,7 +25,7 @@ import org.apache.wookie.w3c.ILocalizedE
* @version $Id$
*/
public interface ILocalizedBean extends ILocalizedElement
-{
+{
/**
* Get localized text direction.
*
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/FeatureImpl.java
Fri Jun 8 13:23:09 2012
@@ -16,6 +16,7 @@ package org.apache.wookie.beans.jpa.impl
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -91,7 +92,7 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#getFeatureName()
*/
- public String getFeatureName()
+ public String getName()
{
return featureName;
}
@@ -99,7 +100,7 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#setFeatureName(java.lang.String)
*/
- public void setFeatureName(String featureName)
+ public void setName(String featureName)
{
this.featureName = featureName;
}
@@ -107,19 +108,21 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#getParameters()
*/
- public Collection<IParam> getParameters()
+ public List<IParam> getParameters()
{
if (parameters == null)
{
parameters = new ArrayList<ParamImpl>();
}
- return new
InverseRelationshipCollection<FeatureImpl,ParamImpl,IParam>(this, parameters);
+ ArrayList<IParam> params = new ArrayList<IParam>();
+ params.addAll( new
InverseRelationshipCollection<FeatureImpl,ParamImpl,IParam>(this, parameters));
+ return params;
}
/* (non-Javadoc)
* @see
org.apache.wookie.beans.IFeature#setParameters(java.util.Collection)
*/
- public void setParameters(Collection<IParam> parameters)
+ public void setParameters(List<IParam> parameters)
{
getParameters().clear();
if (parameters != null)
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/LocalizedBeanImpl.java
Fri Jun 8 13:23:09 2012
@@ -28,8 +28,8 @@ import org.apache.wookie.beans.ILocalize
*/
@MappedSuperclass
public abstract class LocalizedBeanImpl implements ILocalizedBean
-{
- @Basic
+{
+ @Basic
@Column(name="dir")
private String dir;
Modified:
incubator/wookie/trunk/src/org/apache/wookie/feature/oauth/oAuthClient.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/feature/oauth/oAuthClient.java?rev=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/feature/oauth/oAuthClient.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/feature/oauth/oAuthClient.java
Fri Jun 8 13:23:09 2012
@@ -87,7 +87,7 @@ public class oAuthClient implements IFea
Collection<org.apache.wookie.beans.IFeature> widgetFeatures =
widgetInstance.getWidget().getFeatures();
org.apache.wookie.beans.IFeature oAuthFeature = null;
for (org.apache.wookie.beans.IFeature aFeature :
widgetFeatures) {
- if (getName().equals(aFeature.getFeatureName())) {
+ if (getName().equals(aFeature.getName())) {
oAuthFeature = aFeature;
break;
}
@@ -227,7 +227,7 @@ public class oAuthClient implements IFea
Collection<org.apache.wookie.beans.IFeature> widgetFeatures =
widgetInstance.getWidget().getFeatures();
org.apache.wookie.beans.IFeature oAuthFeature = null;
for (org.apache.wookie.beans.IFeature aFeature :
widgetFeatures) {
- if (getName().equals(aFeature.getFeatureName())) {
+ if (getName().equals(aFeature.getName())) {
oAuthFeature = aFeature;
break;
}
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=1348060&r1=1348059&r2=1348060&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Fri
Jun 8 13:23:09 2012
@@ -195,11 +195,11 @@ public class WidgetFactory {
private static void createFeatures(IPersistenceManager
persistenceManager, W3CWidget model, IWidget widget){
for(IFeatureEntity featureEntity: model.getFeatures()){
IFeature feature = persistenceManager.newInstance(IFeature.class);
- feature.setFeatureName(featureEntity.getName());
+ feature.setName(featureEntity.getName());
feature.setRequired(featureEntity.isRequired());
widget.getFeatures().add(feature);
// now attach all parameters to this feature.
- for(IParamEntity paramEntity :
featureEntity.getParams()){
+ for(IParamEntity paramEntity :
featureEntity.getParameters()){
IParam param = persistenceManager.newInstance(IParam.class);
param.setName(paramEntity.getName());
param.setValue(paramEntity.getValue());
