[portal-commits] JBoss Portal SVN: r9154 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2007-11-28 03:36:25 -0500 (Wed, 28 Nov 2007)
New Revision: 9154

Modified:
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
Log:
- JBPORTAL-1714:
  + Remove unused refreshRegistrationInfo method.
  + Properly display status messages.
  + modifyRegistration refreshes the consumer.
  + ConsumerManagerBean.refresh method now returns a RefreshResult for better control.

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2007-11-28 08:32:11 UTC (rev 9153)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2007-11-28 08:36:25 UTC (rev 9154)
@@ -318,42 +318,20 @@
             }
          }
 
-         return manager.refresh(consumer);
-      }
-
-      beanContext.createErrorMessage("Couldn't save Consumer!");
-      return null;
-   }
-
-   public String refreshRegistrationInfo()
-   {
-      if (consumer != null)
-      {
-         String param = beanContext.getParameter("mergeLocalInfo");
-         boolean mergeLocalInfo = Boolean.valueOf(param).booleanValue();
-         try
+         RefreshResult result = manager.refresh(consumer);
+         if (result.hasIssues())
          {
-            RefreshResult result = getProducerInfo().refreshRegistrationInfo(mergeLocalInfo);
-            if (result.hasIssues())
-            {
-               beanContext.createErrorMessage(result.getStatus());
-            }
-            else
-            {
-               beanContext.createInfoMessage(null, result.getStatus());
-            }
-
-            registrationModified = false;
+            registrationModified = true; // if we have issues, it might indicate a need to modify the registration
          }
-         catch (Exception e)
+         else
          {
-            beanContext.createErrorMessageFrom(e);
-            return null;
+            registrationModified = false;
          }
-         return null;
+
+         return ConsumerManagerBean.CONFIGURE_CONSUMER;
       }
 
-      beanContext.createErrorMessage("Couldn't refresh Registration info!");
+      beanContext.createErrorMessage("Couldn't refresh Consumer!");
       return null;
    }
 
@@ -373,8 +351,10 @@
                info.modifyRegistration();
                getProducerInfo().getRegistrationInfo().setModified(false);
 
-               beanContext.createInfoMessage(null, "Successfully modified Registration!");
+               beanContext.createInfoMessage("Successfully modified Registration!");
                registrationModified = false;
+
+               refreshConsumer();
             }
             catch (Exception e)
             {

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2007-11-28 08:32:11 UTC (rev 9153)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java	2007-11-28 08:36:25 UTC (rev 9154)
@@ -245,7 +245,7 @@
                registry.deactivateConsumerWith(consumer.getProducerId());
             }
 
-            beanContext.createInfoMessage(null, result.getStatus());
+            beanContext.createInfoMessage(result.getStatus());
          }
          return result;
       }
@@ -256,12 +256,12 @@
       }
    }
 
-   String refresh(WSRPConsumer consumer)
+   RefreshResult refresh(WSRPConsumer consumer)
    {
-      internalRefresh(consumer);
+      RefreshResult result = internalRefresh(consumer);
       selectedId = consumer.getProducerId();
       setConsumerIdInSession(false);
-      return CONFIGURE_CONSUMER;
+      return result;
    }
 
    public String listConsumers()