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

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2008-09-30 18:27:59 -0400 (Tue, 30 Sep 2008)
New Revision: 12007

Modified:
   branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
Log:
- Added convenience methods to make usage of dataTable in JSF easier.

Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2008-09-30 22:25:43 UTC (rev 12006)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java	2008-09-30 22:27:59 UTC (rev 12007)
@@ -29,12 +29,15 @@
 import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
 import org.jboss.portal.wsrp.consumer.ProducerInfo;
 import org.jboss.portal.wsrp.consumer.RegistrationInfo;
+import org.jboss.portal.wsrp.consumer.RegistrationProperty;
 
 import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
@@ -284,17 +287,37 @@
       return getProducerInfo().hasLocalRegistrationInfo();
    }
 
+   public boolean isRegistrationPropertiesEmpty()
+   {
+      RegistrationInfo regInfo = getProducerInfo().getRegistrationInfo();
+      return regInfo == null || regInfo.isRegistrationPropertiesEmpty();
+   }
+
+   public boolean isExpectedRegistrationPropertiesEmpty()
+   {
+      return getExpectedRegistrationInfo().isRegistrationPropertiesEmpty();
+   }
+
    public RegistrationInfo getExpectedRegistrationInfo()
    {
       if (expectedRegistrationInfo == null)
       {
-         Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
-         expectedRegistrationInfo = (RegistrationInfo)sessionMap.get(ConsumerManagerBean.EXPECTED_REG_INFO_KEY);
+         expectedRegistrationInfo = beanContext.getFromSession(ConsumerManagerBean.EXPECTED_REG_INFO_KEY, RegistrationInfo.class);
       }
 
       return expectedRegistrationInfo;
    }
 
+   public List<RegistrationProperty> getRegistrationProperties()
+   {
+      return new LinkedList<RegistrationProperty>(getProducerInfo().getRegistrationInfo().getRegistrationProperties().values());
+   }
+
+   public List<RegistrationProperty> getExpectedRegistrationProperties()
+   {
+      return new ArrayList<RegistrationProperty>(getExpectedRegistrationInfo().getRegistrationProperties().values());
+   }
+
    // Actions
 
    public String update()
@@ -361,7 +384,7 @@
             }
          }
 
-         // if the registration is locally modified, bypassed the refresh as it will not yield a proper result
+         // if the registration is locally modified, bypass the refresh as it will not yield a proper result
          if (!isRegistrationLocallyModified())
          {
             manager.refresh(consumer);