[jboss-svn-commits] JBoss Portal SVN: r5545 - in trunk/portlet/src/main/org/jboss/portal/portlet/state: consumer producer

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-10-31 19:03:22 -0500 (Tue, 31 Oct 2006)
New Revision: 5545

Modified:
   trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
Log:
- Replaced hard-coded length in substring by actual length value.
- Code clean-ups.

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java	2006-10-31 22:56:30 UTC (rev 5544)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java	2006-11-01 00:03:22 UTC (rev 5545)
@@ -69,11 +69,11 @@
       {
          throw new IllegalArgumentException();
       }
-      if (wrappedCCP.startsWith(CLONE_ID_PREFIX) == false)
+      if (!wrappedCCP.startsWith(CLONE_ID_PREFIX))
       {
          throw new InvalidPortletIdException(wrappedCCP);
       }
-      return new PortletContext(wrappedCCP.substring(1));
+      return new PortletContext(wrappedCCP.substring(CLONE_ID_PREFIX.length()));
    }
 
    public PortletContext unwrapPOP(String wrappedPOPId) throws InvalidPortletIdException
@@ -386,7 +386,7 @@
       //
       if (portletId.startsWith(CLONE_ID_PREFIX))
       {
-         String stateId = portletId.substring(1);
+         String stateId = portletId.substring(CLONE_ID_PREFIX.length());
          try
          {
             ConsumerStateContext stateCtx = persistenceManager.loadState(stateId);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java	2006-10-31 22:56:30 UTC (rev 5544)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java	2006-11-01 00:03:22 UTC (rev 5545)
@@ -159,7 +159,7 @@
       {
          try
          {
-            ProducerState state = persistenceManager.loadState(portletId.substring(1));
+            ProducerState state = persistenceManager.loadState(portletId.substring(PRODUCER_CLONE_ID_PREFIX.length()));
             return portletInvoker.getPortlet(new PortletContext(state.getPortletId()));
          }
          catch (NoSuchStateException e)
@@ -299,7 +299,7 @@
                   if (!newPrefs.keySet().contains(key))
                   {
                      PreferenceInfo pref = prefsInfo.getPreference(key);
-                     if (Boolean.TRUE.equals(pref.isReadOnly()) == false)
+                     if (Boolean.FALSE.equals(pref.isReadOnly()))
                      {
                         newPrefs.setProperty(key, pref.getDefaultValue());
                      }
@@ -318,7 +318,7 @@
          }
          else if (access == AccessMode.READ_WRITE)
          {
-            if (portletContext instanceof StatefulPortletContext == false)
+            if (!(portletContext instanceof StatefulPortletContext))
             {
                // Update the state
                try
@@ -371,7 +371,7 @@
          {
             try
             {
-               String stateId = portletId.substring(1);
+               String stateId = portletId.substring(PRODUCER_CLONE_ID_PREFIX.length());
                String cloneId = PRODUCER_CLONE_ID_PREFIX + persistenceManager.cloneState(stateId);
                return new PortletContext(cloneId);
             }
@@ -425,10 +425,10 @@
          PortletContext portletContext = (PortletContext)i.next();
 
          // We only take care of producer hosted state
-         if (portletContext instanceof StatefulPortletContext == false)
+         if (!(portletContext instanceof StatefulPortletContext))
          {
             String portletId = portletContext.getId();
-            if (portletId.startsWith(PRODUCER_CLONE_ID_PREFIX) == false)
+            if (!portletId.startsWith(PRODUCER_CLONE_ID_PREFIX))
             {
                log.debug("Attempt to destroy a producer offered portlet " + portletId);
                DestroyCloneFailure failure = new DestroyCloneFailure(portletId, "Cannot destroy POP");
@@ -438,7 +438,7 @@
             {
                try
                {
-                  persistenceManager.destroyState(portletId.substring(1));
+                  persistenceManager.destroyState(portletId.substring(PRODUCER_CLONE_ID_PREFIX.length()));
                }
                catch (NoSuchStateException e)
                {
@@ -508,7 +508,7 @@
          {
             String key = (String)i.next();
             PreferenceInfo pref = prefs.getPreference(key);
-            if (Boolean.TRUE.equals(pref.isReadOnly()) || props.keySet().contains(pref.getKey()) == false)
+            if (Boolean.TRUE.equals(pref.isReadOnly()) || !props.keySet().contains(pref.getKey()))
             {
                Value defaultValue = pref.getDefaultValue();
                props.setProperty(key, (Value)defaultValue.clone());
@@ -604,7 +604,7 @@
       }
 
       //
-      if (portletContext instanceof StatefulPortletContext == false)
+      if (!(portletContext instanceof StatefulPortletContext))
       {
          String stateId = ((ProducerStateContext)state).getId();
          try
@@ -680,12 +680,12 @@
     */
    private ProducerState getProducerState(PortletContext portletContext) throws NoSuchPortletException, InvalidPortletIdException
    {
-      if (portletContext instanceof StatefulPortletContext == false)
+      if (!(portletContext instanceof StatefulPortletContext))
       {
          String portletId = portletContext.getId();
-         if (portletContext.getId().startsWith(PRODUCER_CLONE_ID_PREFIX) == true)
+         if (portletContext.getId().startsWith(PRODUCER_CLONE_ID_PREFIX))
          {
-            String stateId = portletId.substring(1);
+            String stateId = portletId.substring(PRODUCER_CLONE_ID_PREFIX.length());
             try
             {
                return persistenceManager.loadState(stateId);