Author: taylor
Date: Thu Jun 7 18:21:15 2007
New Revision: 545361
URL: http://svn.apache.org/viewvc?view=rev&rev=545361
Log:
fix from Vivek Kumar to NOT show Solo window state in action bar
thanks to Ate Douma for some deep and late night explanations for us :)
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java?view=diff&rev=545361&r1=545360&r2=545361
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/PrintSoloDecoratorActionsFactory.java
Thu Jun 7 18:21:15 2007
@@ -25,7 +25,10 @@
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
+import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.security.SecurityAccessController;
import org.apache.pluto.om.window.PortletWindow;
public class PrintSoloDecoratorActionsFactory extends
AbstractDecoratorActionsFactory
@@ -56,7 +59,8 @@
}
public List getDecoratorActions(RequestContext rc, PortletApplication pa,
PortletWindow pw, PortletMode pm,
- WindowState ws, Decoration decoration, List
actionTemplates)
+ WindowState ws, Decoration decoration, List
actionTemplates,
+ PortletDefinitionComposite portlet, ContentFragment
fragment, SecurityAccessController accessController)
{
int printModeIndex = actionTemplates.indexOf(PRINT_MODE_TEMPLATE);
int soloStateIndex = actionTemplates.indexOf(SOLO_ACTION_TEMPLATE);
@@ -76,8 +80,7 @@
}
// else if (printModeIndex != -1)
// support switching to different modes once in "solo" state, even
back to "print"
-
- return
super.getDecoratorActions(rc,pa,pw,pm,ws,decoration,actionTemplates);
+ return
super.getDecoratorActions(rc,pa,pw,pm,ws,decoration,actionTemplates, portlet,
fragment, accessController);
}
protected DecoratorAction createAction(RequestContext rc, PortletWindow
pw, Decoration decoration,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
