[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/portlet/state/producer ...

[Julien Viet]

  User: julien  
  Date: 06/08/22 10:51:48

  Modified:    portlet/src/main/org/jboss/portal/portlet/state/producer 
                        StatefulPortletInvoker.java
  Log:
  added getProperties(String portletId, Set keys) on PortletInvoker to match WSRP semantics
  
  Revision  Changes    Path
  1.13      +21 -7     jboss-portal/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulPortletInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/state/producer/StatefulPortletInvoker.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- StatefulPortletInvoker.java	22 Aug 2006 14:08:54 -0000	1.12
  +++ StatefulPortletInvoker.java	22 Aug 2006 14:51:48 -0000	1.13
  @@ -45,7 +45,7 @@
   
   /**
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class StatefulPortletInvoker extends AbstractJBossService implements PortletInvoker
   {
  @@ -396,7 +396,20 @@
         }
      }
   
  -   public PropertyMap getProperties(final String portletId) throws PortletInvokerException
  +
  +
  +   public PropertyMap getProperties(String portletId, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
  +   {
  +      if (keys == null)
  +      {
  +         throw new IllegalArgumentException("Keys must not be null");
  +      }
  +      PropertyMap props = getProperties(portletId);
  +      props.keySet().retainAll(keys);
  +      return props;
  +   }
  +
  +   public PropertyMap getProperties(String portletId) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
      {
         if (portletId == null)
         {
  @@ -407,13 +420,14 @@
            // Get state id
            String stateId = portletId.substring(1);
   
  -         // Load state from store
  +         //
            try
            {
  +            // Load state from store
               State state = stateStore.loadState(stateId);
   
               // Get the content
  -            PropertyMap values = new SimplePropertyMap(state.getProperties());
  +            PropertyMap props = new SimplePropertyMap(state.getProperties());
   
               // Dereference the portlet
               String referencedPortletId = state.getPortletId();
  @@ -436,15 +450,15 @@
               {
                  String key = (String)i.next();
                  PreferenceInfo pref = prefs.getPreference(key);
  -               if (Boolean.TRUE.equals(pref.isReadOnly()) || values.keySet().contains(pref.getKey()) == false)
  +               if (Boolean.TRUE.equals(pref.isReadOnly()) || props.keySet().contains(pref.getKey()) == false)
                  {
                     Value defaultValue = pref.getDefaultValue();
  -                  values.setProperty(key, (Value)defaultValue.clone());
  +                  props.setProperty(key, (Value)defaultValue.clone());
                  }
               }
   
               //
  -            return values;
  +            return props;
            }
            catch (NoSuchStateException e)
            {