[jboss-cvs] JBossAS SVN: r81574 - in projects/jboss-man/trunk/managed/src: main/java/org/jboss/managed/plugins and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-11-25 16:06:55 -0500 (Tue, 25 Nov 2008)
New Revision: 81574

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/Fields.java
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java
   projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PropertyMetaMapperUnitTestCase.java
Log:
JBMAN-48, Add isModified flag to ManagedProperty
svn merge -c81527 https://svn.jboss.org/repos/jbossas/projects/jboss-man/branches/Branch_2_0


Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/Fields.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/Fields.java	2008-11-25 21:05:19 UTC (rev 81573)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/Fields.java	2008-11-25 21:06:55 UTC (rev 81574)
@@ -76,6 +76,9 @@
    /** The removed flag */
    String REMOVED = "removed";
 
+   /** The modified flag */
+   String MODIFIED = "modified";
+
    // TODO other standard fields here
 
    /**

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java	2008-11-25 21:05:19 UTC (rev 81573)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/api/ManagedProperty.java	2008-11-25 21:06:55 UTC (rev 81574)
@@ -179,6 +179,13 @@
    boolean isMandatory();
 
    /**
+    * Whether the property has been edited/modified.
+    * 
+    * @return true when modified
+    */
+   boolean isModified();
+
+   /**
     * Whether the property has been marked as removed from its ManagedObject.
     * @return true is the property has been removed.
     */

Modified: projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java	2008-11-25 21:05:19 UTC (rev 81573)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java	2008-11-25 21:06:55 UTC (rev 81574)
@@ -386,7 +386,22 @@
          return false;
       return result;
    }
-   
+
+   public boolean isModified()
+   {
+      Boolean result = getField(Fields.MODIFIED, Boolean.class);
+      if (result == null)
+         return false;
+      return result;
+   }
+   public void setModified(boolean flag)
+   {
+      if (flag)
+         setField(Fields.MODIFIED, flag);
+      else
+         setField(Fields.MODIFIED, null);
+   }
+
    /**
     * Set whether the field is mandatory
     * 

Modified: projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PropertyMetaMapperUnitTestCase.java
===================================================================
--- projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PropertyMetaMapperUnitTestCase.java	2008-11-25 21:05:19 UTC (rev 81573)
+++ projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PropertyMetaMapperUnitTestCase.java	2008-11-25 21:06:55 UTC (rev 81574)
@@ -47,21 +47,28 @@
  */
 public class PropertyMetaMapperUnitTestCase extends AbstractManagedObjectFactoryTest
 {
+   private ObjectNameBean bean;
 
    public PropertyMetaMapperUnitTestCase(String name)
    {
       super(name);
    }
 
-   public void testObjectNameBean()
+   protected void setUp()
       throws Exception
    {
-      ObjectNameBean bean = new ObjectNameBean();
+      super.setUp();
+
+      bean = new ObjectNameBean();
       bean.setNameAsString(new ObjectName("testObjectNameBean:key1=value1,key2=value2"));
       bean.setNameAsComposite(new ObjectName("nameAsComposite:key1=value1,key2=value2"));
       bean.setNameAsCompositeFixedKeys(new ObjectName("nameAsCompositeFixedKeys:key1=value1,key2=value2"));
       bean.setNameAsProperties(new ObjectName("nameAsProperties:key1=value1,key2=value2"));
+   }
 
+   public void testNameAsString()
+      throws Exception
+   {
       // A String type for ObjectName
       ManagedObject managedObject = super.initManagedObject(bean);
       ManagedProperty nameAsString = managedObject.getProperty("nameAsString");
@@ -71,7 +78,12 @@
       nameAsString.setValue(SimpleValueSupport.wrap("testObjectNameBean-update:key1=value1,key2=value2"));
       ObjectName nameAsStringON = bean.getNameAsString();
       assertEquals("testObjectNameBean-update", nameAsStringON.getDomain());
+   }
 
+   public void testNameAsComposite()
+   {
+      ManagedObject managedObject = super.initManagedObject(bean);
+
       // A CompositeMetaType for ObjectName
       ManagedProperty nameAsComposite = managedObject.getProperty("nameAsComposite");
       assertTrue(nameAsComposite.getTransientAttachment(MetaMapper.class) != null);
@@ -86,7 +98,12 @@
       nameAsComposite.setValue(value);
       ObjectName nameAsCompositeON = bean.getNameAsComposite();
       assertEquals("nameAsComposite-update:key1=value1,key2=value2,key3=value3", nameAsCompositeON.getCanonicalName());
+   }
 
+   public void testNameAsCompositeFixedKeys()
+   {
+      ManagedObject managedObject = super.initManagedObject(bean);
+   
       // A CompositeMetaType for ObjectName
       ManagedProperty nameAsCompositeFixedKeys = managedObject.getProperty("nameAsCompositeFixedKeys");
       assertTrue(nameAsCompositeFixedKeys.getTransientAttachment(MetaMapper.class) != null);
@@ -95,16 +112,22 @@
       CompositeMetaType nameAsCompositeFixedKeysCMT = (CompositeMetaType) nameAsCompositeFixedKeysType;
       assertEquals("The first key", nameAsCompositeFixedKeysCMT.getDescription("key1"));
       assertEquals("The second key", nameAsCompositeFixedKeysCMT.getDescription("key2"));
-      map = new HashMap<String, MetaValue>();
+      Map<String, MetaValue> map = new HashMap<String, MetaValue>();
       map.put("domain", SimpleValueSupport.wrap("nameAsCompositeFixedKeys-update"));
       map.put("key1", SimpleValueSupport.wrap("value1"));
       map.put("key2", SimpleValueSupport.wrap("value2"));
       map.put("key3", SimpleValueSupport.wrap("value3"));
-      value = new MapCompositeValueSupport(map, SimpleMetaType.STRING);
+      MapCompositeValueSupport value = new MapCompositeValueSupport(map, SimpleMetaType.STRING);
       nameAsCompositeFixedKeys.setValue(value);
       ObjectName nameAsCompositeFixedKeysON = bean.getNameAsCompositeFixedKeys();
       assertEquals("nameAsCompositeFixedKeys-update:key1=value1,key2=value2,key3=value3", nameAsCompositeFixedKeysON.getCanonicalName());
+   }
+   
+   public void testNameAsProperties()
+   {
+      ManagedObject managedObject = super.initManagedObject(bean);
 
+      // A PropertiesMetaType for ObjectName
       ManagedProperty nameAsProperties = managedObject.getProperty("nameAsProperties");
       assertTrue(nameAsProperties.getTransientAttachment(MetaMapper.class) != null);
       MetaType nameAsPropertiesType = nameAsProperties.getMetaType();