weaver      2005/04/29 06:59:46

  Modified:    jetspeed-api/src/java/org/apache/jetspeed/container/window
                        PortletWindowAccessor.java
               
jetspeed-api/src/java/org/apache/jetspeed/components/portletentity
                        PortletEntityAccessComponent.java
  Log:
  See JS2-252: http://issues.apache.org/jira/browse/JS2-252
  
  Revision  Changes    Path
  1.7       +4 -4      
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java
  
  Index: PortletWindowAccessor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/container/window/PortletWindowAccessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PortletWindowAccessor.java        11 Jan 2005 20:01:32 -0000      1.6
  +++ PortletWindowAccessor.java        29 Apr 2005 13:59:46 -0000      1.7
  @@ -15,7 +15,7 @@
    */
   package org.apache.jetspeed.container.window;
   
  -import org.apache.jetspeed.om.page.Fragment;
  +import org.apache.jetspeed.om.page.ContentFragment;
   import org.apache.pluto.om.entity.PortletEntity;
   import org.apache.pluto.om.window.PortletWindow;
   
  @@ -35,7 +35,7 @@
        * @throws FailedToRetrievePortletWindow
        * @throws InconsistentWindowStateException If the window references a 
non-existsent PortletEntity
        */
  -    PortletWindow getPortletWindow(Fragment fragment) throws 
FailedToRetrievePortletWindow;
  +    PortletWindow getPortletWindow(ContentFragment fragment) throws 
FailedToRetrievePortletWindow;
       
       /**
        * Get the portlet window for a fragment and given principal
  @@ -46,7 +46,7 @@
        * @throws FailedToRetrievePortletWindow
        * @throws InconsistentWindowStateException If the window references a 
non-existsent PortletEntity
        */
  -    PortletWindow getPortletWindow(Fragment fragment, String principal) 
throws FailedToCreateWindowException, FailedToRetrievePortletWindow;
  +    PortletWindow getPortletWindow(ContentFragment fragment, String 
principal) throws FailedToCreateWindowException, FailedToRetrievePortletWindow;
   
       /**
        * Lookup a portlet window in the cache
  
  
  
  1.8       +4 -3      
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java
  
  Index: PortletEntityAccessComponent.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponent.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PortletEntityAccessComponent.java 5 Jan 2005 04:25:29 -0000       1.7
  +++ PortletEntityAccessComponent.java 29 Apr 2005 13:59:46 -0000      1.8
  @@ -19,6 +19,7 @@
   import java.util.Collection;
   
   import org.apache.jetspeed.om.common.portlet.MutablePortletEntity;
  +import org.apache.jetspeed.om.page.ContentFragment;
   import org.apache.jetspeed.om.page.Fragment;
   import org.apache.pluto.om.common.ObjectID;
   import org.apache.pluto.om.common.PreferenceSet;
  @@ -60,7 +61,7 @@
         * @return
         * @throws PortletEntityNotGeneratedException
         */
  -     MutablePortletEntity generateEntityFromFragment(Fragment fragment, 
String principal) throws PortletEntityNotGeneratedException;
  +     MutablePortletEntity generateEntityFromFragment(ContentFragment 
fragment, String principal) throws PortletEntityNotGeneratedException;
        
        /**
         * 
  @@ -72,7 +73,7 @@
         * @return
         * @throws PortletEntityNotGeneratedException
         */
  -     MutablePortletEntity generateEntityFromFragment(Fragment fragment) 
throws PortletEntityNotGeneratedException;
  +     MutablePortletEntity generateEntityFromFragment(ContentFragment 
fragment) throws PortletEntityNotGeneratedException;
          
        /**
         * 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to