[jboss-cvs] JBossAS SVN: r90087 - projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins.

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

Author: emuckenhuber
Date: 2009-06-11 08:55:59 -0400 (Thu, 11 Jun 2009)
New Revision: 90087

Modified:
   projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java
Log:
JBMAN-88

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	2009-06-11 12:54:21 UTC (rev 90086)
+++ projects/jboss-man/trunk/managed/src/main/java/org/jboss/managed/plugins/ManagedPropertyImpl.java	2009-06-11 12:55:59 UTC (rev 90087)
@@ -27,8 +27,6 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -303,7 +301,7 @@
       ViewUse[] useField = getField(Fields.VIEW_USE, ViewUse[].class);
       // Also look to the ManagementProperty annotation
       Map<String, Annotation> annotations = getAnnotations();
-      if(annotations != null)
+      if(annotations != null && annotations.isEmpty() == false)
       {
          ManagementProperty mp = (ManagementProperty) annotations.get(ManagementProperty.class.getName());
          if(mp != null)
@@ -320,10 +318,18 @@
                {
                   uses.add(vu);
                }
-               use = new ViewUse[uses.size()];
-               uses.toArray(use);
+               use = uses.toArray(new ViewUse[uses.size()]);
+               setViewUse(use);
             }
+            else
+            {
+               setViewUse(use);
+            }
          }
+         else
+         {
+            use = useField;
+         }
       }
       else if(useField != null)
       {
@@ -355,6 +361,7 @@
             for(String view : mpViews)
                views.add(view);
             adminViews = views;
+            setAdminViewUses(adminViews);
          }
       }
       if(adminViews == null)
@@ -635,6 +642,10 @@
    private void writeObject(ObjectOutputStream out)
       throws IOException
    {
+      // FIXME initialize values
+      getViewUse();
+      getAdminViewUses();
+
       out.writeInt(STREAM_VERSION);
       out.writeObject(fields);
       out.writeObject(managedObject);