You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/07/20 20:53:46 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl PathNavigationalState.java SessionNavigationalState.java
weaver 2004/07/20 11:53:46
Modified: portal/src/java/org/apache/jetspeed/container/session/impl
PathNavigationalState.java
SessionNavigationalState.java
Log:
Become a good citizen:
- create() and createUrl() never return null and throw unchecked exceptions as this should not happen
under normal circumstances.
Revision Changes Path
1.12 +5 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java
Index: PathNavigationalState.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/PathNavigationalState.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PathNavigationalState.java 28 May 2004 18:54:08 -0000 1.11
+++ PathNavigationalState.java 20 Jul 2004 18:53:46 -0000 1.12
@@ -26,10 +26,10 @@
import org.apache.jetspeed.container.session.NavigationalStateComponent;
import org.apache.jetspeed.container.url.PortalControlParameter;
import org.apache.jetspeed.container.url.PortalURL;
-import org.apache.jetspeed.container.url.impl.PortalControlParameterImpl;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.util.ArgUtil;
import org.apache.pluto.om.window.PortletWindow;
@@ -60,7 +60,8 @@
public void init(RequestContext context)
{
- this.url = context.getPortalURL();
+ ArgUtil.assertNotNull(RequestContext.class, context, this, "init()");
+ this.url = context.getPortalURL();
}
public WindowState getState(PortletWindow window)
@@ -100,6 +101,7 @@
public PortletWindow getMaximizedWindow(Page page)
{
+ ArgUtil.assertNotNull(Page.class, page, this, "getMaximizedWindow()");
PortalControlParameter pcp = url.getControlParameters();
Iterator stateful = pcp.getStateFullControlParameter().entrySet().iterator();
while (stateful.hasNext())
1.17 +3 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java
Index: SessionNavigationalState.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/session/impl/SessionNavigationalState.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SessionNavigationalState.java 7 Jun 2004 22:20:06 -0000 1.16
+++ SessionNavigationalState.java 20 Jul 2004 18:53:46 -0000 1.17
@@ -31,6 +31,7 @@
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.util.ArgUtil;
import org.apache.pluto.om.window.PortletWindow;
/**
@@ -195,6 +196,7 @@
public PortletWindow getMaximizedWindow(Page page)
{
+ ArgUtil.assertNotNull(Page.class, page, this, "getMaximizedWindow()");
return (PortletWindow)pages.get(page.getId());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org