[jboss-cvs] JBossAS SVN: r84723 - projects/jboss-felix/trunk/modules/integration/deployer/src/main/java/org/jboss/osgi/deployer.

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

Author: alesj
Date: 2009-02-25 06:48:36 -0500 (Wed, 25 Feb 2009)
New Revision: 84723

Modified:
   projects/jboss-felix/trunk/modules/integration/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java
Log:
Simple refactoring.

Modified: projects/jboss-felix/trunk/modules/integration/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java
===================================================================
--- projects/jboss-felix/trunk/modules/integration/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java	2009-02-25 11:41:40 UTC (rev 84722)
+++ projects/jboss-felix/trunk/modules/integration/deployer/src/main/java/org/jboss/osgi/deployer/OSGiMetaDataDeployer.java	2009-02-25 11:48:36 UTC (rev 84723)
@@ -27,9 +27,9 @@
 import java.util.jar.Manifest;
 
 import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
-import org.jboss.deployers.vfs.spi.deployer.ManifestMetaData;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
+import org.osgi.framework.Constants;
 
 /**
  * This is the OSGi Deployer
@@ -37,7 +37,7 @@
  * @author Thomas.Diesler at jboss.org
  * @since 03-Feb-2009
  */
-public class OSGiMetaDataDeployer<T extends ManifestMetaData> extends ManifestDeployer<OSGiMetaData>
+public class OSGiMetaDataDeployer extends ManifestDeployer<OSGiMetaData>
 {
   public OSGiMetaDataDeployer()
   {
@@ -59,13 +59,11 @@
   @Override
   protected OSGiMetaData createMetaData(Manifest manifest) throws Exception
   {
-    OSGiMetaData metaData = null;
-
     Attributes attribs = manifest.getMainAttributes();
-    String symbolicName = attribs.getValue("Bundle-SymbolicName");
+    String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
     if (symbolicName != null)
-      metaData = new OSGiMetaData(symbolicName);
+      return new OSGiMetaData(symbolicName);
 
-    return metaData;
+    return null;
   }
 }