[portal-commits] JBoss Portal SVN: r13571 - branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui.
Author: chris.laprun(a)jboss.com
Date: 2009-07-21 17:52:12 -0400 (Tue, 21 Jul 2009)
New Revision: 13571
Modified:
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
Log:
- JBPORTAL-2410: report error instead of saving configuration with old values (which is
correct but confusing for users).
Modified:
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
===================================================================
---
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-07-21
21:48:49 UTC (rev 13570)
+++
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2009-07-21
21:52:12 UTC (rev 13571)
@@ -55,9 +55,12 @@
private static final String PROPERTY = "property";
private static final String PRODUCER = "producer";
private String selectedProp;
+ private boolean invalidPolicy;
+ private boolean invalidValidator;
// todo: use ParameterValidation.VALID_ASCII_CLASS_NAME when available...
public final static Pattern VALID_ASCII_CLASS_NAME =
Pattern.compile("([a-z][a-z0-9_]*\\.)*[A-Z][A-Za-z0-9_$]*");
+ private static final String INVALID_CLASS_NAME_ERROR =
"INVALID_CLASS_NAME_ERROR";
public ProducerBean()
{
@@ -84,7 +87,7 @@
@Override
public String getErrorMessageKey()
{
- return "INVALID_CLASS_NAME_ERROR";
+ return INVALID_CLASS_NAME_ERROR;
}
});
@@ -149,7 +152,12 @@
if (className != null)
{
policyClassName = className;
+ invalidPolicy = false;
}
+ else
+ {
+ invalidPolicy = true;
+ }
}
public boolean isDefaultRegistrationPolicy()
@@ -172,7 +180,12 @@
if (className != null)
{
validatorClassName = className;
+ invalidValidator = false;
}
+ else
+ {
+ invalidValidator = true;
+ }
}
public boolean isStrictMode()
@@ -215,12 +228,19 @@
{
try
{
- if
(!ProducerRegistrationRequirements.DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+ if (!invalidPolicy && !invalidValidator)
{
- getRegRequirements().reloadPolicyFrom(policyClassName, validatorClassName);
+ if
(!ProducerRegistrationRequirements.DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+ {
+ getRegRequirements().reloadPolicyFrom(policyClassName,
validatorClassName);
+ }
+ configurationService.saveConfiguration();
+ beanContext.createInfoMessage("bean_producer_save_success");
}
- configurationService.saveConfiguration();
- beanContext.createInfoMessage("bean_producer_save_success");
+ else
+ {
+ beanContext.createErrorMessage("bean_producer_cannot_save",
"Invalid class name.");
+ }
}
catch (Exception e)
{