[jboss-osgi-commits] JBoss-OSGI SVN: r100976 - projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/metadata/internal.

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

Author: alesj
Date: 2010-02-15 12:30:56 -0500 (Mon, 15 Feb 2010)
New Revision: 100976

Modified:
   projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiPojoMetaData.java
Log:
Use bmd builder.

Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiPojoMetaData.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiPojoMetaData.java	2010-02-15 16:22:49 UTC (rev 100975)
+++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiPojoMetaData.java	2010-02-15 17:30:56 UTC (rev 100976)
@@ -23,11 +23,8 @@
 package org.jboss.osgi.framework.metadata.internal;
 
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
-import org.jboss.beans.metadata.plugins.AbstractRelatedClassMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.DemandMetaData;
-import org.jboss.beans.metadata.spi.RelatedClassMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementProperties;
@@ -35,7 +32,6 @@
 
 import javax.xml.bind.annotation.*;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -81,32 +77,16 @@
    {
       if (initialized == false)
       {
+         BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(this);
          if (exposedTypes != null && exposedTypes.isEmpty() == false)
          {
-            Set<RelatedClassMetaData> rcmds = getRelated();
-            if (rcmds == null)
-            {
-               rcmds = new HashSet<RelatedClassMetaData>();
-               setRelated(rcmds);
-            }
             for (String exposedType : exposedTypes)
             {
-               AbstractRelatedClassMetaData rcmd = new AbstractRelatedClassMetaData(exposedType);
-               rcmd.setEnabled(Collections.<Object>singleton("OSGi"));
-               rcmds.add(rcmd);
+               builder.addRelatedClass(exposedType, "OSGi");
             }
          }
+         builder.addDemand(mdrService, ControllerState.PRE_INSTALL, null);
 
-         Set<DemandMetaData> demands = getDemands();
-         if (demands == null)
-         {
-            demands = new HashSet<DemandMetaData>();
-            setDemands(demands);
-         }
-         AbstractDemandMetaData dmd = new AbstractDemandMetaData(mdrService);
-         dmd.setWhenRequired(ControllerState.PRE_INSTALL);
-         demands.add(dmd);
-
          initialized = true;
       }
       return Collections.singletonList((BeanMetaData)this);