svn commit: r959898 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen: ModelScreen.java ModelScreenWidget.java

[lektran]

Author: lektran
Date: Fri Jul  2 07:49:21 2010
New Revision: 959898

URL: http://svn.apache.org/viewvc?rev=959898&view=rev
Log:
Removed all usage of the deprecated ModelScreenAction class

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=959898&r1=959897&r2=959898&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Fri Jul  2 07:49:21 2010
@@ -39,6 +39,7 @@ import org.ofbiz.entity.transaction.Tran
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.webapp.control.ConfigXMLReader;
 import org.ofbiz.widget.ModelWidget;
+import org.ofbiz.widget.ModelWidgetAction;
 import org.w3c.dom.Element;
 
 /**
@@ -89,13 +90,13 @@ public class ModelScreen extends ModelWi
 
     protected static void findServiceNamesUsedInWidget(ModelScreenWidget currentWidget, Set<String> allServiceNamesUsed) {
         if (currentWidget instanceof ModelScreenWidget.Section) {
-            List<ModelScreenAction> actions = ((ModelScreenWidget.Section)currentWidget).actions;
+            List<ModelWidgetAction> actions = ((ModelScreenWidget.Section)currentWidget).actions;
             List<ModelScreenWidget> subWidgets = ((ModelScreenWidget.Section)currentWidget).subWidgets;
             List<ModelScreenWidget> failWidgets = ((ModelScreenWidget.Section)currentWidget).failWidgets;
             if (actions != null) {
-                for (ModelScreenAction screenOperation: actions) {
-                    if (screenOperation instanceof ModelScreenAction.Service) {
-                        String serviceName = ((ModelScreenAction.Service) screenOperation).serviceNameExdr.getOriginal();
+                for (ModelWidgetAction screenOperation: actions) {
+                    if (screenOperation instanceof ModelWidgetAction.Service) {
+                        String serviceName = ((ModelWidgetAction.Service) screenOperation).getServiceNameExdr().getOriginal();
                         if (UtilValidate.isNotEmpty(serviceName)) allServiceNamesUsed.add(serviceName);
                     }
                 }
@@ -148,25 +149,25 @@ public class ModelScreen extends ModelWi
     }
     protected static void findEntityNamesUsedInWidget(ModelScreenWidget currentWidget, Set<String> allEntityNamesUsed) {
         if (currentWidget instanceof ModelScreenWidget.Section) {
-            List<ModelScreenAction> actions = ((ModelScreenWidget.Section)currentWidget).actions;
+            List<ModelWidgetAction> actions = ((ModelScreenWidget.Section)currentWidget).actions;
             List<ModelScreenWidget> subWidgets = ((ModelScreenWidget.Section)currentWidget).subWidgets;
             List<ModelScreenWidget> failWidgets = ((ModelScreenWidget.Section)currentWidget).failWidgets;
             if (actions != null) {
-                for (ModelScreenAction screenOperation: actions) {
-                    if (screenOperation instanceof ModelScreenAction.EntityOne) {
-                        String entName = ((ModelScreenAction.EntityOne) screenOperation).finder.getEntityName();
+                for (ModelWidgetAction screenOperation: actions) {
+                    if (screenOperation instanceof ModelWidgetAction.EntityOne) {
+                        String entName = ((ModelWidgetAction.EntityOne) screenOperation).getFinder().getEntityName();
                         if (UtilValidate.isNotEmpty(entName)) allEntityNamesUsed.add(entName);
-                    } else if (screenOperation instanceof ModelScreenAction.EntityAnd) {
-                        String entName = ((ModelScreenAction.EntityAnd) screenOperation).finder.getEntityName();
+                    } else if (screenOperation instanceof ModelWidgetAction.EntityAnd) {
+                        String entName = ((ModelWidgetAction.EntityAnd) screenOperation).getFinder().getEntityName();
                         if (UtilValidate.isNotEmpty(entName)) allEntityNamesUsed.add(entName);
-                    } else if (screenOperation instanceof ModelScreenAction.EntityCondition) {
-                        String entName = ((ModelScreenAction.EntityCondition) screenOperation).finder.getEntityName();
+                    } else if (screenOperation instanceof ModelWidgetAction.EntityCondition) {
+                        String entName = ((ModelWidgetAction.EntityCondition) screenOperation).getFinder().getEntityName();
                         if (UtilValidate.isNotEmpty(entName)) allEntityNamesUsed.add(entName);
-                    } else if (screenOperation instanceof ModelScreenAction.GetRelated) {
-                        String relationName = ((ModelScreenAction.GetRelated) screenOperation).relationName;
+                    } else if (screenOperation instanceof ModelWidgetAction.GetRelated) {
+                        String relationName = ((ModelWidgetAction.GetRelated) screenOperation).getRelationName();
                         if (UtilValidate.isNotEmpty(relationName)) allEntityNamesUsed.add(relationName);
-                    } else if (screenOperation instanceof ModelScreenAction.GetRelatedOne) {
-                        String relationName = ((ModelScreenAction.GetRelatedOne) screenOperation).relationName;
+                    } else if (screenOperation instanceof ModelWidgetAction.GetRelatedOne) {
+                        String relationName = ((ModelWidgetAction.GetRelatedOne) screenOperation).getRelationName();
                         if (UtilValidate.isNotEmpty(relationName)) allEntityNamesUsed.add(relationName);
                     }
                 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=959898&r1=959897&r2=959898&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Fri Jul  2 07:49:21 2010
@@ -45,6 +45,7 @@ import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.widget.ModelWidget;
+import org.ofbiz.widget.ModelWidgetAction;
 import org.ofbiz.widget.WidgetFactory;
 import org.ofbiz.widget.WidgetWorker;
 import org.ofbiz.widget.form.FormFactory;
@@ -131,7 +132,7 @@ public abstract class ModelScreenWidget
     public static class Section extends ModelScreenWidget {
         public static final String TAG_NAME = "section";
         protected ModelScreenCondition condition;
-        protected List<ModelScreenAction> actions;
+        protected List<ModelWidgetAction> actions;
         protected List<ModelScreenWidget> subWidgets;
         protected List<ModelScreenWidget> failWidgets;
         public boolean isMainSection = false;
@@ -148,7 +149,7 @@ public abstract class ModelScreenWidget
             // read all actions under the "actions" element
             Element actionsElement = UtilXml.firstChildElement(sectionElement, "actions");
             if (actionsElement != null) {
-                this.actions = ModelScreenAction.readSubActions(modelScreen, actionsElement);
+                this.actions = ModelWidgetAction.readSubActions(modelScreen, actionsElement);
             }
 
             // read sub-widgets
@@ -177,7 +178,7 @@ public abstract class ModelScreenWidget
             // if condition does not exist or evals to true run actions and render widgets, otherwise render fail-widgets
             if (condTrue) {
                 // run the actions only if true
-                ModelScreenAction.runSubActions(this.actions, context);
+                ModelWidgetAction.runSubActions(this.actions, context);
 
                 try {
                     // section by definition do not themselves do anything, so this method will generally do nothing, but we'll call it anyway