taylor 2004/11/08 09:26:14
Modified: fusion/src/java/org/apache/jetspeed/fusion/portal/portlets
JetspeedFusionPortlet.java
Log:
ok, we can now get View mode to show up again
Now I need to go through, well, everything.... sync'ing JSR 168 window mode
changes to J1 and visa versa
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.9 +11 -3
jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/portlets/JetspeedFusionPortlet.java
Index: JetspeedFusionPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/portal/portlets/JetspeedFusionPortlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JetspeedFusionPortlet.java 8 Nov 2004 05:20:45 -0000 1.8
+++ JetspeedFusionPortlet.java 8 Nov 2004 17:26:13 -0000 1.9
@@ -31,6 +31,7 @@
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.container.state.MutableNavigationalState;
import org.apache.jetspeed.container.state.NavigationalStateComponent;
+import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.engine.Engine;
import org.apache.jetspeed.portal.PortletException;
@@ -248,8 +249,15 @@
public MutableNavigationalState getNavigationalState(JetspeedRunData
data)
{
- return
-
(MutableNavigationalState)data.getSession().getAttribute(NavigationalState.NAVSTATE_SESSION_KEY);
+ NavigationalState ns = null;
+ RequestContext context = (RequestContext)
data.getRequest().getAttribute(FUSION_NAV_STATE);
+ if (context != null)
+ {
+ PortalURL url = context.getPortalURL();
+ if (url != null)
+ ns = url.getNavigationalState();
+ }
+ return (MutableNavigationalState)ns;
}
private void syncNavigationalState(PortletWindow window,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
