Author: scottbw
Date: Fri Jun 8 11:02:27 2012
New Revision: 1348023
URL: http://svn.apache.org/viewvc?rev=1348023&view=rev
Log:
Refactored get/set ParameterName/ParameterValue to get/set Name/Value to be
consistent with parser API. See WOOKIE-345
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.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/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java?rev=1348023&r1=1348022&r2=1348023&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
Fri Jun 8 11:02:27 2012
@@ -57,7 +57,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#getParameterName()
*/
- public String getParameterName()
+ public String getName()
{
return parameterName;
}
@@ -65,7 +65,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#setParameterName(java.lang.String)
*/
- public void setParameterName(String parameterName)
+ public void setName(String parameterName)
{
this.parameterName = parameterName;
}
@@ -73,7 +73,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#getParameterValue()
*/
- public String getParameterValue()
+ public String getValue()
{
return parameterValue;
}
@@ -81,7 +81,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#setParameterValue(java.lang.String)
*/
- public void setParameterValue(String parameterValue)
+ public void setValue(String parameterValue)
{
this.parameterValue = parameterValue;
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java?rev=1348023&r1=1348022&r2=1348023&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IParam.java Fri Jun 8
11:02:27 2012
@@ -28,26 +28,26 @@ public interface IParam
*
* @return parameter name
*/
- String getParameterName();
+ String getName();
/**
* Set widget feature parameter name.
*
* @return parameterName parameter name
*/
- void setParameterName(String parameterName);
+ void setName(String name);
/**
* Get widget feature parameter value.
*
* @return parameter value
*/
- String getParameterValue();
+ String getValue();
/**
* Set widget feature parameter value.
*
* @return parameterValue parameter value
*/
- void setParameterValue(String parameterValue);
+ void setValue(String value);
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java?rev=1348023&r1=1348022&r2=1348023&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/ParamImpl.java
Fri Jun 8 11:02:27 2012
@@ -74,7 +74,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#getParameterName()
*/
- public String getParameterName()
+ public String getName()
{
return parameterName;
}
@@ -82,7 +82,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#setParameterName(java.lang.String)
*/
- public void setParameterName(String parameterName)
+ public void setName(String parameterName)
{
this.parameterName = parameterName;
}
@@ -90,7 +90,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#getParameterValue()
*/
- public String getParameterValue()
+ public String getValue()
{
return parameterValue;
}
@@ -98,7 +98,7 @@ public class ParamImpl implements IParam
/* (non-Javadoc)
* @see org.apache.wookie.beans.IParam#setParameterValue(java.lang.String)
*/
- public void setParameterValue(String parameterValue)
+ public void setValue(String parameterValue)
{
this.parameterValue = parameterValue;
}
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=1348023&r1=1348022&r2=1348023&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 11:02:27 2012
@@ -102,15 +102,15 @@ public class oAuthClient implements IFea
String authzServer = null;
String scope = "";
for (IParam aParam : oAuthParams) {
- String paramName =
aParam.getParameterName().toLowerCase();
- String paramValue = aParam.getParameterValue();
+ String paramName = aParam.getName().toLowerCase();
+ String paramValue = aParam.getValue();
if ("authzserver".equals(paramName)) {
authzServer = paramValue;
} else if ("clientid".equals(paramName)) {
if (!"auto".equalsIgnoreCase(paramValue)) {
clientId = paramValue;
}
- } else if ("scope".equals(aParam.getParameterName())) {
+ } else if ("scope".equals(aParam.getName())) {
scope = paramValue;
} else if ("redirecturi".equals(paramName)) {
if (paramValue.length() != 0 &&
!"auto".equalsIgnoreCase(paramValue)) {
@@ -237,7 +237,7 @@ public class oAuthClient implements IFea
Collection<IParam> oAuthParams = oAuthFeature.getParameters();
Map<String, String> oAuthParamMap = new HashMap<String,
String>();
for (IParam aParam : oAuthParams) {
- oAuthParamMap.put(aParam.getParameterName(),
aParam.getParameterValue());
+ oAuthParamMap.put(aParam.getName(), aParam.getValue());
}
return oAuthParamMap;
}
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=1348023&r1=1348022&r2=1348023&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 11:02:27 2012
@@ -201,8 +201,8 @@ public class WidgetFactory {
// now attach all parameters to this feature.
for(IParamEntity paramEntity :
featureEntity.getParams()){
IParam param = persistenceManager.newInstance(IParam.class);
- param.setParameterName(paramEntity.getName());
- param.setParameterValue(paramEntity.getValue());
+ param.setName(paramEntity.getName());
+ param.setValue(paramEntity.getValue());
feature.getParameters().add(param);
}
}
