Author: scottbw
Date: Sun Feb 24 15:55:29 2013
New Revision: 1449498
URL: http://svn.apache.org/r1449498
Log:
Refactored IPreference to extend the IPreference interface in the parser
package, harmonizing accessor methods (getName vs getDkey, getValue vs
getDValue etc). The JPA column names haven't changed however, so this won't
affect any existing data. This touches quite a few classes, but is a trivial
renaming change and shouldn't affect any functionality.
Modified:
wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/FlatpackFactoryTest.java
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/PreferenceMock.java
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
wookie/trunk/src/org/apache/wookie/beans/IPreference.java
wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
wookie/trunk/src/org/apache/wookie/feature/ext/WookieAPIImpl.java
wookie/trunk/src/org/apache/wookie/flatpack/FlatpackFactory.java
wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
Modified:
wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
---
wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
(original)
+++
wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
Sun Feb 24 15:55:29 2013
@@ -163,8 +163,8 @@ public abstract class AbstractPersistenc
widgetInstance.setShown(true);
widgetInstance.setUserId("test");
IPreference widgetInstancePreference =
persistenceManager.newInstance(IPreference.class);
- widgetInstancePreference.setDkey("sharedDataKey");
- widgetInstancePreference.setDvalue("test-shared-data-key");
+ widgetInstancePreference.setName("sharedDataKey");
+ widgetInstancePreference.setValue("test-shared-data-key");
widgetInstancePreference.setReadOnly(true);
widgetInstance.getPreferences().add(widgetInstancePreference);
//
Modified:
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/FlatpackFactoryTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/FlatpackFactoryTest.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
---
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/FlatpackFactoryTest.java
(original)
+++
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/FlatpackFactoryTest.java
Sun Feb 24 15:55:29 2013
@@ -227,8 +227,8 @@ public class FlatpackFactoryTest {
IWidgetInstance instance = new WidgetInstanceMock();
ArrayList<IPreference> prefs = new ArrayList<IPreference>();
IPreference pref = new PreferenceMock();
- pref.setDkey("hiScore");
- pref.setDvalue("1000");
+ pref.setName("hiScore");
+ pref.setValue("1000");
pref.setReadOnly(false);
prefs.add(pref);
instance.setPreferences(prefs);
@@ -276,8 +276,8 @@ public class FlatpackFactoryTest {
IWidgetInstance instance = new WidgetInstanceMock();
ArrayList<IPreference> prefs = new ArrayList<IPreference>();
IPreference pref = new PreferenceMock();
- pref.setDkey("moderator");
- pref.setDvalue("true");
+ pref.setName("moderator");
+ pref.setValue("true");
pref.setReadOnly(false);
prefs.add(pref);
instance.setPreferences(prefs);
Modified:
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/PreferenceMock.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/PreferenceMock.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/PreferenceMock.java
(original)
+++ wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/PreferenceMock.java
Sun Feb 24 15:55:29 2013
@@ -35,7 +35,7 @@ public class PreferenceMock implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDkey()
*/
- public String getDkey() {
+ public String getName() {
return key;
}
@@ -43,21 +43,21 @@ public class PreferenceMock implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDkey(java.lang.String)
*/
- public void setDkey(String dkey) {
+ public void setName(String dkey) {
key = dkey;
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDvalue()
*/
- public String getDvalue() {
+ public String getValue() {
return value;
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDvalue(java.lang.String)
*/
- public void setDvalue(String dvalue) {
+ public void setValue(String dvalue) {
value = dvalue;
}
Modified:
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
---
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
(original)
+++
wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
Sun Feb 24 15:55:29 2013
@@ -253,7 +253,7 @@ public class WidgetInstanceMock implemen
*/
public IPreference getPreference(String key) {
for (IPreference pref: this.preferences){
- if (pref.getDkey().equals(key)){
+ if (pref.getName().equals(key)){
return pref;
}
}
Modified:
wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
(original)
+++ wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/PreferenceDelegate.java
Sun Feb 24 15:55:29 2013
@@ -37,22 +37,22 @@ public class PreferenceDelegate implemen
* @param pref
*/
public PreferenceDelegate(IPreference pref){
- this.dkey = pref.getDkey();
- this.dvalue = pref.getDvalue();
+ this.dkey = pref.getName();
+ this.dvalue = pref.getValue();
this.readOnly = pref.isReadOnly();
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDkey()
*/
- public String getDkey() {
+ public String getName() {
return dkey;
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDvalue()
*/
- public String getDvalue() {
+ public String getValue() {
return dvalue;
}
@@ -66,14 +66,14 @@ public class PreferenceDelegate implemen
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDkey(java.lang.String)
*/
- public void setDkey(String dkey) {
+ public void setName(String dkey) {
this.dkey = dkey;
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDvalue(java.lang.String)
*/
- public void setDvalue(String dvalue) {
+ public void setValue(String dvalue) {
this.dvalue = dvalue;
}
Modified: wookie/trunk/src/org/apache/wookie/beans/IPreference.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/beans/IPreference.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/beans/IPreference.java (original)
+++ wookie/trunk/src/org/apache/wookie/beans/IPreference.java Sun Feb 24
15:55:29 2013
@@ -21,47 +21,7 @@ package org.apache.wookie.beans;
* @author <a href="mailto:[email protected]";>Randy Watler</a>
* @version $Id$
*/
-public interface IPreference extends IBean
+public interface IPreference extends IBean, org.apache.wookie.w3c.IPreference
{
- /**
- * Get widget instance preference value key.
- *
- * @return value key
- */
- String getDkey();
-
- /**
- * Set widget instance preference value key.
- *
- * @param dkey value key
- */
- void setDkey(String dkey);
-
- /**
- * Get widget instance preference value.
- *
- * @return value
- */
- String getDvalue();
-
- /**
- * Set widget instance preference value.
- *
- * @param dvalue value
- */
- void setDvalue(String dvalue);
-
- /**
- * Get widget instance preference read only flag.
- *
- * @return read only flag
- */
- boolean isReadOnly();
-
- /**
- * Set widget instance preference read only flag.
- *
- * @param readOnly read only flag
- */
- void setReadOnly(boolean readOnly);
+
}
Modified: wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java (original)
+++ wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java Sun Feb 24
15:55:29 2013
@@ -224,7 +224,7 @@ public interface IWidgetInstance extends
public static IPreference getPreference(IWidgetInstance widgetInstance,
String key)
{
for (IPreference preference: widgetInstance.getPreferences()){
- if (preference.getDkey().equals(key)) return preference;
+ if (preference.getName().equals(key)) return preference;
}
return null;
}
Modified: wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java
(original)
+++ wookie/trunk/src/org/apache/wookie/beans/jpa/impl/PreferenceImpl.java Sun
Feb 24 15:55:29 2013
@@ -65,7 +65,7 @@ public class PreferenceImpl implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDkey()
*/
- public String getDkey()
+ public String getName()
{
return dkey;
}
@@ -73,7 +73,7 @@ public class PreferenceImpl implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDkey(java.lang.String)
*/
- public void setDkey(String dkey)
+ public void setName(String dkey)
{
this.dkey = dkey;
}
@@ -81,7 +81,7 @@ public class PreferenceImpl implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#getDvalue()
*/
- public String getDvalue()
+ public String getValue()
{
return dvalue;
}
@@ -89,7 +89,7 @@ public class PreferenceImpl implements I
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreference#setDvalue(java.lang.String)
*/
- public void setDvalue(String dvalue)
+ public void setValue(String dvalue)
{
this.dvalue = dvalue;
}
Modified:
wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java
(original)
+++ wookie/trunk/src/org/apache/wookie/controller/PropertiesController.java Sun
Feb 24 15:55:29 2013
@@ -88,7 +88,7 @@ public class PropertiesController extend
// Note that preferences and shared data keys may be the same!
// We let the shared data values override.
IPreference pref = instance.getPreference(name);
- if (pref != null) value = pref.getDvalue();
+ if (pref != null) value = pref.getValue();
ISharedData data = new
SharedContext(instance).getSharedData(name);
if (data != null) value = data.getDvalue();
if (value == null) throw new ResourceNotFoundException();
@@ -169,15 +169,15 @@ public class PropertiesController extend
widgetInstance.getPreferences().remove(preference);
}
else{
- preference.setDvalue(value);
+ preference.setValue(value);
}
found=true;
}
if(!found){
if (value != null){
preference = persistenceManager.newInstance(IPreference.class);
- preference.setDkey(name);
- preference.setDvalue(value);
+ preference.setName(name);
+ preference.setValue(value);
widgetInstance.getPreferences().add(preference);
}
}
Modified: wookie/trunk/src/org/apache/wookie/feature/ext/WookieAPIImpl.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/feature/ext/WookieAPIImpl.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/feature/ext/WookieAPIImpl.java (original)
+++ wookie/trunk/src/org/apache/wookie/feature/ext/WookieAPIImpl.java Sun Feb
24 15:55:29 2013
@@ -63,7 +63,7 @@ public class WookieAPIImpl implements IW
//
IPreference preference = widgetInstance.getPreference(key);
if (preference == null) return
localizedMessages.getString("WidgetAPIImpl.1");
- return preference.getDvalue();
+ return preference.getValue();
}
/*
Modified: wookie/trunk/src/org/apache/wookie/flatpack/FlatpackFactory.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/flatpack/FlatpackFactory.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/flatpack/FlatpackFactory.java (original)
+++ wookie/trunk/src/org/apache/wookie/flatpack/FlatpackFactory.java Sun Feb 24
15:55:29 2013
@@ -224,8 +224,8 @@ public class FlatpackFactory {
//
for (IPreference pref : instance.getPreferences()) {
PreferenceEntity newPref = (PreferenceEntity) getPreference(
- pref.getDkey(), widget);
- newPref.setValue(pref.getDvalue());
+ pref.getName(), widget);
+ newPref.setValue(pref.getValue());
newPref.setReadOnly(pref.isReadOnly());
widget.getPreferences().add(newPref);
}
Modified: wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java?rev=1449498&r1=1449497&r2=1449498&view=diff
==============================================================================
--- wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
(original)
+++ wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java Sun
Feb 24 15:55:29 2013
@@ -186,8 +186,8 @@ public class WidgetInstanceFactory{
*/
private void setPreference(IPersistenceManager persistenceManager,
IWidgetInstance widgetInstance, String key, String value, boolean readOnly){
IPreference pref =
persistenceManager.newInstance(IPreference.class);
- pref.setDkey(key);
- pref.setDvalue(value);
+ pref.setName(key);
+ pref.setValue(value);
pref.setReadOnly(readOnly);
widgetInstance.getPreferences().add(pref);
}
