svn commit: r592735 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3: components/portal/src/java/org

Author: woonsan
Date: Wed Nov  7 04:54:35 2007
New Revision: 592735

URL: 
http://svn.apache.org/viewvc?rev=592735&view=rev
Log:
[JS2-808] Maximize on edit-defaults option
Implemented 'maximizeOnEditDefaults' option: portlet is
maximizing in edit_defaults mode.

Modified:
   
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/AbstractDecoratorAc
tionsFactory.java
   
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecorationValve.jav
a
   
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecoratorActionsFac
tory.java
   
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-IN
F/assembly/pipelines.xml

Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/AbstractDecoratorAc
tionsFactory.java
URL: http://svn.ap
ache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/c
omponents/portal/src/java/org/apache/jetspeed/decoration/Abs
tractDecoratorActionsFactory.java?rev=592735&r1=592734&a
mp;r2=592735&view=diff
============================================================
==================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/AbstractDecoratorAc
tionsFactory.java (original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/AbstractDecoratorAc
tionsFactory.java Wed Nov  7 04:54:35 2007
 -40,6
+40,7 
 {
     private static ThreadLocal actionResourcesMap = new
ThreadLocal();
     private boolean editMaximizesOption = false;
+    private boolean editDefaultsMaximizesOption = false;
     
     /**
      * When Edit is clicked, also maximize the window
state
 -114,9
+115,14 
 
         WindowState ws;
         PortletMode pm;
-        if (editMaximizesOption)
+        if (editMaximizesOption ||
editDefaultsMaximizesOption)
         {
-            if
(template.getAction().equals(JetspeedActions.EDIT))
+            if (editMaximizesOption &&
template.getAction().equals(JetspeedActions.EDIT))
+            {
+                ws = WindowState.MAXIMIZED;
+                pm = template.getCustomMode();
+            }
+            else if (editDefaultsMaximizesOption &&
template.getAction().equals(JetspeedActions.EDIT_DEFAULTS))
             {
                 ws = WindowState.MAXIMIZED;
                 pm = template.getCustomMode();
 -207,4
+213,13 
         return this.editMaximizesOption;
     }
     
+    public void setMaximizeOnEditDefaults(boolean
maxOnEditDefaults)
+    {
+        this.editDefaultsMaximizesOption =
maxOnEditDefaults;
+    }
+    
+    public boolean getMaximizeOnEditDefaults()
+    {
+        return this.editDefaultsMaximizesOption;
+    }
 }

Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecorationValve.jav
a
URL: http://svn.apache.org/viewvc/
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecorationValve.jav
a?rev=592735&r1=592734&r2=592735&view=diff
============================================================
==================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecorationValve.jav
a (original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecorationValve.jav
a Wed Nov  7 04:54:35 2007
 -89,6
+89,11 
     
     private boolean maxOnEdit = false;
     
+    private boolean maxOnEditDefaults = false;
+
+    /**
+     * When edit_defaults mode is not supported by a
portlet, support the mode automatically.
+     */
     private boolean autoSwitchingToEditDefaultsModes =
true;
          
      /**
 -293,6
+298,7 
                 {
                     adapter =
(DecoratorActionsFactory)Class.forName(decoratorActionsAdapt
erClassName).newInstance();
                    
adapter.setMaximizeOnEdit(this.maxOnEdit);
+                   
adapter.setMaximizeOnEditDefaults(this.maxOnEditDefaults);
                 }
                 catch (Exception e)
                 {
 -635,6
+641,17 
     public boolean getMaximizeOnEdit()
     {
         return this.maxOnEdit;
+    }
+    
+    public void setMaximizeOnEditDefaults(boolean
maxOnEditDefaults)
+    {
+        this.maxOnEditDefaults = maxOnEditDefaults;
+       
this.defaultDecoratorActionsFactory.setMaximizeOnEditDefault
s(maxOnEditDefaults);
+    }
+    
+    public boolean getMaximizeOnEditDefaults()
+    {
+        return this.maxOnEditDefaults;
     }
     
     public void setAutoSwitchingToEditDefaultsModes(boolean
autoSwitchingToEditDefaultsModes)

Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecoratorActionsFac
tory.java
URL: http://svn.apache.org
/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/component
s/portal/src/java/org/apache/jetspeed/decoration/DecoratorAc
tionsFactory.java?rev=592735&r1=592734&r2=592735&
;view=diff
============================================================
==================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecoratorActionsFac
tory.java (original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/components/portal
/src/java/org/apache/jetspeed/decoration/DecoratorActionsFac
tory.java Wed Nov  7 04:54:35 2007
 -49,4
+49,16 
      */
     public boolean getMaximizeOnEdit();
     
+    /**
+     * Maximize portlet window when going into
edit_defaults mode
+     * param maxOnEditDefaults
+     */
+    void setMaximizeOnEditDefaults(boolean
maxOnEditDefaults);
+    
+    /**
+     * Maximize portlet window when going into
edit_defaults mode
+     * 
+     * return
+     */
+    public boolean getMaximizeOnEditDefaults();
 }

Modified:
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-IN
F/assembly/pipelines.xml
URL: http:/
/svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-
2.1.3/src/webapp/WEB-INF/assembly/pipelines.xml?rev=592735&a
mp;r1=592734&r2=592735&view=diff
============================================================
==================
---
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-IN
F/assembly/pipelines.xml (original)
+++
portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/WEB-IN
F/assembly/pipelines.xml Wed Nov  7 04:54:35 2007
 -323,6
+323,8 
          -->
          <!-- When clicking on Edit Mode, also switch to
Maximize -->
         <property
name="maximizeOnEdit"><value>false</va
lue></property>         
+         <!-- When clicking on Edit_defaults Mode, also
switch to Maximize -->
+        <property
name="maximizeOnEditDefaults"><value>fals
e</value></property>         
         <property
name="autoSwitchingToEditDefaultsModes"><val
ue>false</value></property>
   </bean>
 



------------------------------------------------------------
---------
To unsubscribe, e-mail: jetspeed-dev-unsubscribeportals.apache.org
For additional commands, e-mail: jetspeed-dev-helpportals.apache.org