[portal-commits] JBoss Portal SVN: r12016 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src: resources/portal-wsrp-admin-war/jsf/consumers and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2008-10-01 18:41:59 -0400 (Wed, 01 Oct 2008)
New Revision: 12016
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/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
Log:
- Use expectedRegistrationPropertiesEmpty in editConsumer, fixed bug in implementation.
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-10-01
19:03:41 UTC (rev 12015)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-01
22:41:59 UTC (rev 12016)
@@ -295,7 +295,15 @@
public boolean isExpectedRegistrationPropertiesEmpty()
{
- return getExpectedRegistrationInfo().isRegistrationPropertiesEmpty();
+ RegistrationInfo info = getExpectedRegistrationInfo();
+ if (info != null)
+ {
+ return info.isRegistrationPropertiesEmpty();
+ }
+ else
+ {
+ return true;
+ }
}
public RegistrationInfo getExpectedRegistrationInfo()
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01
19:03:41 UTC (rev 12015)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2008-10-01
22:41:59 UTC (rev 12016)
@@ -132,7 +132,7 @@
<h3
class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3>
<h:panelGroup styleClass="portlet-area-body">
<c:choose>
- <c:when test="#{!empty
consumer.expectedRegistrationInfo.registrationProperties}">
+ <c:when
test="#{consumer.expectedRegistrationPropertiesEmpty}">
<h:dataTable id="expectedProps"
value="#{consumer.expectedRegistrationProperties}" var="prop"
rowClasses="portlet-section-body,portlet-section-alternate"