svn commit: r1652688 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: menu/ModelMenuItem.java xml/XmlWidgetVisitor.java

[adrianc]

Author: adrianc
Date: Sat Jan 17 22:38:38 2015
New Revision: 1652688

URL: http://svn.apache.org/r1652688
Log:
Some fixups for my previous commit.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlWidgetVisitor.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=1652688&r1=1652687&r2=1652688&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java 
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java 
Sat Jan 17 22:38:38 2015
@@ -522,6 +522,32 @@ public class ModelMenuItem extends Model
         private final ModelMenuItem linkMenuItem;
         private final Link link;
 
+        public MenuLink(Element linkElement, ModelMenuItem parentMenuItem) {
+            this.linkMenuItem = parentMenuItem;
+            if (linkElement.getAttribute("text").isEmpty()) {
+                linkElement.setAttribute("text", 
parentMenuItem.getTitle().getOriginal());
+            }
+            if (linkElement.getAttribute("style").isEmpty()) {
+                linkElement.setAttribute("style", 
parentMenuItem.getWidgetStyle());
+            }
+            this.link = new Link(linkElement);
+        }
+
+        public MenuLink(GenericValue portalPage, ModelMenuItem parentMenuItem, 
Locale locale) {
+            this.linkMenuItem = parentMenuItem;
+            ArrayList<Parameter> parameterList = new ArrayList<Parameter>();
+            if (parentMenuItem.link != null) {
+                parameterList.addAll(parentMenuItem.link.getParameterList());
+            }
+            parameterList.add(new Parameter("portalPageId", 
portalPage.getString("portalPageId"), false));
+            parameterList.add(new Parameter("parentPortalPageId", 
portalPage.getString("parentPortalPageId"), false));
+            String target = "showPortalPage";
+            if (parentMenuItem.link != null) {
+                target= "";
+            }
+            this.link = new Link(portalPage, parameterList, target, locale);
+        }
+
         public AutoEntityParameters getAutoEntityParameters() {
             return link.getAutoEntityParameters();
         }
@@ -630,26 +656,6 @@ public class ModelMenuItem extends Model
             return link.getWidth();
         }
 
-        public MenuLink(Element linkElement, ModelMenuItem parentMenuItem) {
-            this.linkMenuItem = parentMenuItem;
-            this.link = new Link(linkElement);
-        }
-
-        public MenuLink(GenericValue portalPage, ModelMenuItem parentMenuItem, 
Locale locale) {
-            this.linkMenuItem = parentMenuItem;
-            ArrayList<Parameter> parameterList = new ArrayList<Parameter>();
-            if (parentMenuItem.link != null) {
-                parameterList.addAll(parentMenuItem.link.getParameterList());
-            }
-            parameterList.add(new Parameter("portalPageId", 
portalPage.getString("portalPageId"), false));
-            parameterList.add(new Parameter("parentPortalPageId", 
portalPage.getString("parentPortalPageId"), false));
-            String target = "showPortalPage";
-            if (parentMenuItem.link != null) {
-                target= "";
-            }
-            this.link = new Link(portalPage, parameterList, target, locale);
-        }
-
         public ModelMenuItem getLinkMenuItem() {
             return linkMenuItem;
         }

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlWidgetVisitor.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlWidgetVisitor.java?rev=1652688&r1=1652687&r2=1652688&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlWidgetVisitor.java 
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlWidgetVisitor.java 
Sat Jan 17 22:38:38 2015
@@ -398,7 +398,8 @@ public class XmlWidgetVisitor extends Ab
             writer.append("</actions>");
         }
         for (ModelMenuItem menuItem : modelMenu.getMenuItemList()) {
-            menuItem.accept(this);;
+            menuItem.accept(this);
+            ;
         }
         writer.append("</menu>");
     }
@@ -433,9 +434,12 @@ public class XmlWidgetVisitor extends Ab
             visitActions(modelMenuItem.getActions());
             writer.append("</actions>");
         }
-        visitLink(modelMenuItem.getLink().getLink());
+        if (modelMenuItem.getLink() != null) {
+            visitLink(modelMenuItem.getLink().getLink());
+        }
         for (ModelMenuItem menuItem : modelMenuItem.getMenuItemList()) {
-            menuItem.accept(this);;
+            menuItem.accept(this);
+            ;
         }
         writer.append("</menu-item>");
     }