[jboss-cvs] JBossAS SVN: r73650 - projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer.

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

Author: alesj
Date: 2008-05-24 04:36:43 -0400 (Sat, 24 May 2008)
New Revision: 73650

Modified:
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java
Log:
Move helper method to superclass.

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java	2008-05-24 07:49:59 UTC (rev 73649)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/JBossExtensionDeployer.java	2008-05-24 08:36:43 UTC (rev 73650)
@@ -99,24 +99,6 @@
    }
 
    /**
-    * Get metadata instance from metadata.
-    *
-    * @param metadata the metadatas map
-    * @param clazz metadata class
-    * @return matching metadata instance
-    */
-   protected <S> S getInstance(Map<Class<?>, List<Object>> metadata, Class<S> clazz)
-   {
-      List<Object> instances = metadata.get(clazz);
-      if (instances == null)
-         return null;
-      else if (instances.size() > 1)
-         throw new IllegalArgumentException("Expecting single instance: " + metadata);
-
-      return clazz.cast(instances.iterator().next());
-   }
-
-   /**
     * Merge spec and extension.
     *
     * @param unit deployment unit

Modified: projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java	2008-05-24 07:49:59 UTC (rev 73649)
+++ projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/MultipleSchemaResolverDeployer.java	2008-05-24 08:36:43 UTC (rev 73650)
@@ -195,4 +195,23 @@
     * @throws Exception for any error
     */
    protected abstract T mergeMetaData(VFSDeploymentUnit unit, Map<Class<?>, List<Object>> metadata) throws Exception;
+
+
+   /**
+    * Get single metadata instance from metadata.
+    *
+    * @param metadata the metadatas map
+    * @param clazz metadata class
+    * @return matching metadata instance
+    */
+   protected <S> S getInstance(Map<Class<?>, List<Object>> metadata, Class<S> clazz)
+   {
+      List<Object> instances = metadata.get(clazz);
+      if (instances == null || instances.isEmpty())
+         return null;
+      else if (instances.size() > 1)
+         throw new IllegalArgumentException("Expecting single instance: " + metadata);
+
+      return clazz.cast(instances.iterator().next());
+   }
 }
\ No newline at end of file