weaver 2004/08/24 14:37:35
Modified: portal/src/java/org/apache/jetspeed/container/session/impl
JetspeedNavigationalStateComponent.java
AbstractNavigationalState.java
jetspeed-api/src/java/org/apache/jetspeed/container/session
NavigationalState.java
Log:
init() method also needs to set the NavigationalStateComponent as in certain
instances. Like after being rehydrated from a serialized session.
Revision Changes Path
1.15 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/JetspeedNavigationalStateComponent.java
Index: JetspeedNavigationalStateComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/JetspeedNavigationalStateComponent.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JetspeedNavigationalStateComponent.java 12 Aug 2004 17:51:25 -0000 1.14
+++ JetspeedNavigationalStateComponent.java 24 Aug 2004 21:37:35 -0000 1.15
@@ -138,7 +138,7 @@
}
else
{
- state.init(context);
+ state.init(context, this);
}
if (sessionBased && session != null)
1.6 +4 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/AbstractNavigationalState.java
Index: AbstractNavigationalState.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/AbstractNavigationalState.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractNavigationalState.java 3 Aug 2004 18:42:24 -0000 1.5
+++ AbstractNavigationalState.java 24 Aug 2004 21:37:35 -0000 1.6
@@ -43,10 +43,12 @@
this.nav = nav;
}
- public void init(RequestContext context)
+ public void init(RequestContext context, NavigationalStateComponent nav)
{
ArgUtil.assertNotNull(RequestContext.class, context, this, "init()");
+ ArgUtil.assertNotNull(NavigationalStateComponent.class, nav, this,
"init()");
this.context = context;
+ this.nav = nav;
}
public boolean isNavigationalParameter(String token)
1.3 +4 -2
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/session/NavigationalState.java
Index: NavigationalState.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/session/NavigationalState.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NavigationalState.java 20 Jul 2004 18:50:32 -0000 1.2
+++ NavigationalState.java 24 Aug 2004 21:37:35 -0000 1.3
@@ -93,7 +93,7 @@
* @throws java.lang.IllegalArgumentException if the <code>context</code>
* id <code>null</code>.
*/
- void init(RequestContext context);
+ void init(RequestContext context, NavigationalStateComponent nav);
/**
@@ -106,5 +106,7 @@
* <code>null</code>.
*/
PortletWindow getMaximizedWindow(Page page);
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
