[jboss-svn-commits] JBL Code SVN: r9370 - labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui.

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

Author: unibrew
Date: 2007-02-06 10:17:49 -0500 (Tue, 06 Feb 2007)
New Revision: 9370

Modified:
   labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
Log:
[JBFORUMS-162] Migrating Fourms for Portal2.2 to work with AS 4.0.5.

Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java	2007-02-06 13:25:57 UTC (rev 9369)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/ForumsJSFPortlet.java	2007-02-06 15:17:49 UTC (rev 9370)
@@ -208,14 +208,15 @@
     public void processAction(ActionRequest request, ActionResponse response) throws PortletException,IOException {
     
         /* DEBUG CODE
-        Map map = request.getParameterMap();
-        Iterator it = map.keySet().iterator();
+        System.out.println ("PARAMETERS IN PROCESSACTION");
+        Map maps = request.getParameterMap();
+        Iterator it = maps.keySet().iterator();
         while (it.hasNext()) {
             String key = (String)it.next();
-            System.out.println("KEY: "+key+" VALUE: "+((String[])map.get(key))[0]);
-        }
-        */
+            System.out.println("KEY: "+key+" VALUE: "+((String[])maps.get(key))[0]);
+        }*/
         
+        
         try
         {
             setPortletRequestFlag(request);
@@ -235,6 +236,20 @@
             }
             
             FacesContext fc = facesContext(request, response);
+            
+            Map map = request.getParameterMap();
+            
+            if (map.get(VIEW)!=null) {
+            String viewName = ((String[])map.get(VIEW))[0];
+            map.put(MyFacesGenericPortlet.VIEW_ID,new String[]{getNameForId(viewName)});
+                if (fc.getViewRoot() != null) {
+                    fc.getViewRoot().setViewId(getNameForId(viewName));
+                } else {
+                    fc.setViewRoot(new UIViewRoot());
+                    fc.getViewRoot().setViewId(getNameForId(viewName));
+                }
+            }
+            
             lifecycle.execute(fc);
 
             if (fc.getResponseComplete()==false)
@@ -267,6 +282,16 @@
      */
     public void doView(RenderRequest request,RenderResponse response) throws PortletException,IOException
     {
+        
+        /* DEBUG CODE
+        System.out.println ("PARAMETERS IN DOVIEW");
+        Map maps = request.getParameterMap();
+        Iterator it = maps.keySet().iterator();
+        while (it.hasNext()) {
+            String key = (String)it.next();
+            System.out.println("KEY: "+key+" VALUE: "+((String[])maps.get(key))[0]);
+        }*/
+        
         FacesContext fc = facesContext(request, response);
         if (request.getPortletSession().getAttribute(CURRENT_FACES_CONTEXT) == null) { 
             request.getPortletSession().setAttribute(CURRENT_FACES_CONTEXT,fc);
@@ -285,43 +310,39 @@
                 return;
             }
             
-            Map map = request.getParameterMap();
-            Map newParams = new HashMap();  
-            newParams.putAll(map);            
-            
             if (facesContext.getViewRoot()==null) {
                 facesContext.setViewRoot(new UIViewRoot());
             }
             
             PortalUtil.executeNotifications();
-            
             // Removing notification parameters from RenderRequest
-            newParams.remove(Constants.p_notified_post_id);
-            newParams.remove(Constants.p_notified_watch_type);
-            
+            Map map = request.getParameterMap();
+            map.remove(Constants.p_notified_post_id);
+            map.remove(Constants.p_notified_watch_type);
             if (map.get(VIEW)!=null) {
-                String viewName = ((String[])newParams.get(VIEW))[0];
-                newParams.put(MyFacesGenericPortlet.VIEW_ID,new String[]{getNameForId(viewName)});
+                String viewName = ((String[])map.get(VIEW))[0];
+                map.put(MyFacesGenericPortlet.VIEW_ID,new String[]{getNameForId(viewName)});
                 facesContext.getViewRoot().setViewId(getNameForId(viewName));
             }
 
-            Class requestClass = PortletRequestImpl.class;
-            Field field = requestClass.getDeclaredField("parameters");
-            field.setAccessible(true);
-            field.set(request, new Parameters(newParams));
-            field.setAccessible(false);
-            
             if (fc.getViewRoot()==null) {
-                if (fc.getViewRoot()==null && newParams.get(VIEW)!=null) {
+                if (fc.getViewRoot()==null && map.get(VIEW)!=null) {
                     fc.setViewRoot(new UIViewRoot());
-                    String viewName = ((String[])newParams.get(VIEW))[0];
+                    String viewName = ((String[])map.get(VIEW))[0];
                     fc.getViewRoot().setViewId(getNameForId(viewName));
+                } else if (map.get(MyFacesGenericPortlet.VIEW_ID)!=null ) {
+                    String viewId = ((String[])map.get(MyFacesGenericPortlet.VIEW_ID))[0];
+                    map.put(MyFacesGenericPortlet.VIEW_ID,new String[]{viewId});
+                    facesContext.getViewRoot().setViewId(getNameForId(viewId));
+                } else {
+                    setPortletRequestFlag(request);
+                    nonFacesRequest(request,response,"/views/index.jsf");
+                    return;
                 }
                 setPortletRequestFlag(request);                
                 
                 lifecycle.execute(fc);
             }
-            
             super.doView(request,response);
         }
         catch(Throwable t)