Author: bdaw Date: 2007-06-17 05:14:54 -0400 (Sun, 17 Jun 2007) New Revision: 7450 Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java Log: fix for error handling in property editor Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2007-06-15 20:15:54 UTC (rev 7449) +++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2007-06-17 09:14:54 UTC (rev 7450) @@ -46,7 +46,7 @@ private final PropertyInfo info; /** . */ - private final boolean inherited; + private boolean inherited; public ControlPropertyBean(ControlPropertiesBean container, PropertyInfo info, boolean inherited, String value) { @@ -81,6 +81,11 @@ return inherited; } + public void setInherited(boolean inherited) + { + this.inherited = inherited; + } + public void inherit(ValueChangeEvent event) { @@ -109,11 +114,14 @@ public void setValue(Object value) { - this.value = value.toString(); + if (!inherited) + { + this.value = value.toString(); - // Need to use the container as it will contain the refreshed object - PortalObject portalObject = container.pomgr.getSelectedObject(); - portalObject.setDeclaredProperty(getName(), value.toString()); + // Need to use the container as it will contain the refreshed object + PortalObject portalObject = container.pomgr.getSelectedObject(); + portalObject.setDeclaredProperty(getName(), value.toString()); + } }