Author: adrianc
Date: Sat Jan 3 21:00:04 2015
New Revision: 1649248
URL: http://svn.apache.org/r1649248
Log:
Renamed ModelWidgetAction factory method to newInstance - which better
describes what it does.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1649248&r1=1649247&r2=1649248&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
Sat Jan 3 21:00:04 2015
@@ -77,7 +77,7 @@ public abstract class ModelWidgetAction
public abstract void accept(ModelActionVisitor visitor);
- public static ModelWidgetAction toModelWidgetAction(ModelWidget
modelWidget, Element actionElement) {
+ public static ModelWidgetAction newInstance(ModelWidget modelWidget,
Element actionElement) {
if ("set".equals(actionElement.getNodeName())) {
return new SetField(modelWidget, actionElement);
} else if ("property-map".equals(actionElement.getNodeName())) {
@@ -107,7 +107,7 @@ public abstract class ModelWidgetAction
List<? extends Element> actionElementList =
UtilXml.childElementList(parentElement);
List<ModelWidgetAction> actions = new
ArrayList<ModelWidgetAction>(actionElementList.size());
for (Element actionElement: actionElementList) {
- actions.add(toModelWidgetAction(modelWidget, actionElement));
+ actions.add(newInstance(modelWidget, actionElement));
}
return Collections.unmodifiableList(actions);
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1649248&r1=1649247&r2=1649248&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
Sat Jan 3 21:00:04 2015
@@ -63,7 +63,7 @@ public abstract class ModelFormAction {
} else if
("call-parent-actions".equals(actionElement.getNodeName())) {
actions.add(new CallParentActions(modelForm, actionElement));
} else {
- actions.add(ModelWidgetAction.toModelWidgetAction(modelForm,
actionElement));
+ actions.add(ModelWidgetAction.newInstance(modelForm,
actionElement));
}
}
return Collections.unmodifiableList(actions);
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java?rev=1649248&r1=1649247&r2=1649248&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
Sat Jan 3 21:00:04 2015
@@ -56,7 +56,7 @@ public abstract class ModelMenuAction {
if ("set".equals(actionElement.getNodeName())) {
actions.add(new SetField(modelMenu, actionElement));
} else {
- actions.add(ModelWidgetAction.toModelWidgetAction(modelMenu,
actionElement));
+ actions.add(ModelWidgetAction.newInstance(modelMenu,
actionElement));
}
}
return Collections.unmodifiableList(actions);
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=1649248&r1=1649247&r2=1649248&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
Sat Jan 3 21:00:04 2015
@@ -78,7 +78,7 @@ public abstract class ModelTreeAction ex
List<ModelWidgetAction> actions = new
ArrayList<ModelWidgetAction>(actionElementList.size());
for (Element actionElement : actionElementList) {
// TODO: Check for tree-specific actions
- actions.add(ModelWidgetAction.toModelWidgetAction(modelNode,
actionElement));
+ actions.add(ModelWidgetAction.newInstance(modelNode,
actionElement));
}
return actions;
}