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 2005/04/29 16:01:57 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window/impl PortletWindowAccessorImpl.java
weaver 2005/04/29 07:01:57
Modified: portal/src/java/org/apache/jetspeed/container/window/impl
PortletWindowAccessorImpl.java
Log:
See JS2-252: http://issues.apache.org/jira/browse/JS2-252
Revision Changes Path
1.12 +10 -10 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
Index: PortletWindowAccessorImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletWindowAccessorImpl.java 11 Jan 2005 20:02:17 -0000 1.11
+++ PortletWindowAccessorImpl.java 29 Apr 2005 14:01:57 -0000 1.12
@@ -28,7 +28,7 @@
import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
-import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
import org.apache.jetspeed.util.ArgUtil;
import org.apache.pluto.om.entity.PortletEntity;
@@ -85,9 +85,9 @@
return getWindowFromCache(windowId);
}
- public PortletWindow getPortletWindow(Fragment fragment) throws FailedToRetrievePortletWindow
+ public PortletWindow getPortletWindow(ContentFragment fragment) throws FailedToRetrievePortletWindow
{
- ArgUtil.assertNotNull(Fragment.class, fragment, this, "getPortletWindow(Fragment fragment)");
+ ArgUtil.assertNotNull(ContentFragment.class, fragment, this, "getPortletWindow(Fragment fragment)");
PortletWindow portletWindow = getWindowFromCache(fragment);
if (portletWindow == null)
{
@@ -117,7 +117,7 @@
* @param portletWindow
* @throws InconsistentWindowStateException
*/
- protected void validateWindow( Fragment fragment, PortletWindow portletWindow ) throws FailedToRetrievePortletWindow
+ protected void validateWindow( ContentFragment fragment, PortletWindow portletWindow ) throws FailedToRetrievePortletWindow
{
// make sure the window has the most up-to-date portlet entity
PortletEntity portletEntity = entityAccessor.getPortletEntityForFragment(fragment);
@@ -132,9 +132,9 @@
}
}
- public PortletWindow getPortletWindow(Fragment fragment, String principal) throws FailedToRetrievePortletWindow, FailedToCreateWindowException
+ public PortletWindow getPortletWindow(ContentFragment fragment, String principal) throws FailedToRetrievePortletWindow, FailedToCreateWindowException
{
- ArgUtil.assertNotNull(Fragment.class, fragment, this, "getPortletWindow(Fragment fragment, String principal)");
+ ArgUtil.assertNotNull(ContentFragment.class, fragment, this, "getPortletWindow(Fragment fragment, String principal)");
ArgUtil.assertNotNull(String.class, principal, this, "getPortletWindow(Fragment fragment, String principal)");
PortletWindow portletWindow = getWindowFromCache(fragment);
if (portletWindow == null)
@@ -149,12 +149,12 @@
return portletWindow;
}
- private PortletWindow createPortletWindow(Fragment fragment) throws FailedToCreateWindowException
+ private PortletWindow createPortletWindow(ContentFragment fragment) throws FailedToCreateWindowException
{
return createPortletWindow(fragment, null);
}
- private PortletWindow createPortletWindow(Fragment fragment, String principal) throws FailedToCreateWindowException
+ private PortletWindow createPortletWindow(ContentFragment fragment, String principal) throws FailedToCreateWindowException
{
PortletWindow portletWindow = new PortletWindowImpl(fragment.getId());
@@ -210,7 +210,7 @@
windows.remove(window.getId().toString());
}
- private PortletWindow getWindowFromCache(Fragment fragment)
+ private PortletWindow getWindowFromCache(ContentFragment fragment)
{
return (PortletWindow)windows.get(fragment.getId());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org