[jboss-svn-commits] JBL Code SVN: r9653 - in labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper: url and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-02-20 09:25:27 -0500 (Tue, 20 Feb 2007)
New Revision: 9653

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsPortalObjectCommandFactoryImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/WikiCommandFactory.java
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
Log:
Wiki mappers

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsPortalObjectCommandFactoryImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsPortalObjectCommandFactoryImpl.java	2007-02-20 14:18:21 UTC (rev 9652)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/LabsPortalObjectCommandFactoryImpl.java	2007-02-20 14:25:27 UTC (rev 9653)
@@ -49,6 +49,7 @@
 
         Map bodyParams = invocation.getServerContext().getBodyParameterMap();
         if (bodyParams == null) { bodyParams = Collections.emptyMap(); }
+        //noinspection unchecked
         Map<String, String[]> queryParams = new HashMap<String, String[]>(
                 invocation.getServerContext().getQueryParameterMap());
         
@@ -89,14 +90,7 @@
         // If any additional navigational parameters where passed and if we
         // can add them, adding them.
         StateString navState = decoder.getNavigationalstate();
-        /*if ((additionalParameters != null) && (navState instanceof PortletParametersStateString)) {
-            PortletParametersStateString ppss = (PortletParametersStateString) navState;
 
-            for (String key : additionalParameters.keySet()) {
-                ppss.setValue(key, additionalParameters.get(key));
-            }
-        }*/
-
         // Returning an appropriate command.
         switch (decoder.getType())
         {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/WikiCommandFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/WikiCommandFactory.java	2007-02-20 14:18:21 UTC (rev 9652)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/WikiCommandFactory.java	2007-02-20 14:25:27 UTC (rev 9653)
@@ -114,7 +114,7 @@
             return getPortalObjectCF().doMapping(invocation, wikiWindow, params.getMap());
         } else {
             params.setValue(PortletRequestDecoder.META_PARAMETER,
-                    Integer.toString(PortletRequestDecoder.ACTION_MASK));            
+                    Integer.toString(PortletRequestDecoder.RENDER_MASK));
             return getPortalObjectCF().doMapping(invocation, wikiWindow, params.getMap());
         }
     }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java	2007-02-20 14:18:21 UTC (rev 9652)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java	2007-02-20 14:25:27 UTC (rev 9653)
@@ -75,25 +75,11 @@
                         PortletRequestEncoder.encodeAction(url, actionCmd.getNavigationalState(),
                                 actionCmd.getInteractionState(), actionCmd.getMode(),
                                 actionCmd.getWindowState());
-
-                        // If the request isn't only an action request, but also, for
-                        // example, window state change, we leave the meta
-                        // parameter intact. Otherwise, we remove it from the
-                        // url.
-                        Object meta = url.getParameterMap().get(
-                                PortletRequestDecoder.META_PARAMETER);
-
-                        if (meta != null) {
-                            int metaInt = Integer.parseInt(((String []) meta)[0], 16);
-
-                            if ((metaInt | PortletRequestDecoder.ACTION_MASK) ==
-                                    PortletRequestDecoder.ACTION_MASK) {
-                                url.getParameterMap().remove(PortletRequestDecoder.META_PARAMETER);
-                            }
-                        }
                     } else if (renderCmd != null) {
                         PortletRequestEncoder.encodeRender(url, navigationalState,
                                 renderCmd.getMode(), renderCmd.getWindowState());
+
+                        url.getParameterMap().remove(PortletRequestDecoder.META_PARAMETER);
                     }
 
                     String[] jsfPageParam = (String[]) url.getParameterMap().get(