svn commit: r1398727 - in /ofbiz/branches/20120329_portletWidget/framework: webtools/widget/CommonScreens.xml widget/dtd/widget-screen.xsd widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

[erwan]

Author: erwan
Date: Tue Oct 16 10:52:36 2012
New Revision: 1398727

URL: http://svn.apache.org/viewvc?rev=1398727&view=rev
Log:
3 simples enhancements
change from protected to public for retrievePortletAttributes method to be able to use it in groovy, in edit screen using in portlet.
Change in screen xsd the pattern for show-portlet conf-mode and use-private to be able to use ${}, stringExpander  is using in java
Add CommonUilabel for webtools portlet decorator

Modified:
    ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml
    ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd
    ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

Modified: ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml?rev=1398727&r1=1398726&r2=1398727&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/webtools/widget/CommonScreens.xml Tue Oct 16 10:52:36 2012
@@ -315,6 +315,7 @@ under the License.
                 <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/>  
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
             </actions>
             <widgets>
                 <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd?rev=1398727&r1=1398726&r2=1398727&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/dtd/widget-screen.xsd Tue Oct 16 10:52:36 2012
@@ -1110,8 +1110,7 @@ under the License.
             <xs:annotation><xs:documentation>Show the portal in configuration mode.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
+                    <xs:pattern value="\$\{[a-zA-Z_]{1}[a-zA-Z0-9_\-.]+\}|true|false" />
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
@@ -1119,8 +1118,7 @@ under the License.
             <xs:annotation><xs:documentation>If a derived private PortalPage exists for the actual UserLogin than show the private PortalPage instead of the original.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
-                    <xs:enumeration value="true"/>
-                    <xs:enumeration value="false"/>
+                    <xs:pattern value="\$\{[a-zA-Z_]{1}[a-zA-Z0-9_\-.]+\}|true|false" />
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>

Modified: ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1398727&r1=1398726&r2=1398727&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Tue Oct 16 10:52:36 2012
@@ -1859,7 +1859,7 @@ public abstract class ModelScreenWidget
             }
         }
 
-        protected static Map<String,Object> retrievePortletAttributes (Map<String,Object> context) throws GenericEntityException {
+        public static Map<String,Object> retrievePortletAttributes (Map<String,Object> context) throws GenericEntityException {
             Delegator delegator = (Delegator) context.get("delegator");
             String portalPageId = (String) context.get("portalPageId");
             String portalPortletId = (String) context.get("portalPortletId");