svn commit: r666399 - in /incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb: DefaultXMLAdapterExtensionPoint.java XMLAdapterExtensionPoint.java

[rf...@apache.org]

Author: rfeng
Date: Tue Jun 10 17:25:28 2008
New Revision: 666399

URL: http://svn.apache.org/viewvc?rev=666399&view=rev
Log:
Clean up the generics in the interface

Modified:
    incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
    incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java?rev=666399&r1=666398&r2=666399&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java Tue Jun 10 17:25:28 2008
@@ -28,33 +28,32 @@
  * @version $Rev$ $Date$
  */
 public class DefaultXMLAdapterExtensionPoint implements XMLAdapterExtensionPoint {
-    private Map<Class<?>, Class<? extends XmlAdapter<?, ?>>> adapters =
-        new ConcurrentHashMap<Class<?>, Class<? extends XmlAdapter<?, ?>>>();
+    private Map<Class<?>, Class<? extends XmlAdapter>> adapters =
+        new ConcurrentHashMap<Class<?>, Class<? extends XmlAdapter>>();
 
-    public <B, A extends XmlAdapter<?, B>> void addAdapter(Class<B> boundType, Class<A> adapter) {
+    public void addAdapter(Class<?> boundType, Class<? extends XmlAdapter> adapter) {
         adapters.put(boundType, adapter);
     }
 
-    @SuppressWarnings("unchecked")
-    public <B, A extends XmlAdapter<?, B>> Class<A> getAdapter(Class<B> boundType) {
-        Class<A> cls = (Class<A>)adapters.get(boundType);
+    public Class<? extends XmlAdapter> getAdapter(Class<?> boundType) {
+        Class<? extends XmlAdapter> cls = adapters.get(boundType);
         if (cls != null) {
             return cls;
         }
-        for (Map.Entry<Class<?>, Class<? extends XmlAdapter<?, ?>>> e : adapters.entrySet()) {
+        for (Map.Entry<Class<?>, Class<? extends XmlAdapter>> e : adapters.entrySet()) {
             if (e.getKey().isAssignableFrom(boundType)) {
-                return ((Class<A>)e.getValue());
+                return e.getValue();
             }
         }
         return null;
     }
 
     @SuppressWarnings("unchecked")
-    public <B, A extends XmlAdapter<?, B>> Class<A> removeAdapter(Class<B> boundType) {
-        return (Class<A>)adapters.remove(boundType);
+    public Class<? extends XmlAdapter> removeAdapter(Class<?> boundType) {
+        return adapters.remove(boundType);
     }
 
-    public Map<Class<?>, Class<? extends XmlAdapter<?, ?>>> getAdapters() {
+    public Map<Class<?>, Class<? extends XmlAdapter>> getAdapters() {
         return adapters;
     }
 

Modified: incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java?rev=666399&r1=666398&r2=666399&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java Tue Jun 10 17:25:28 2008
@@ -28,30 +28,25 @@
  */
 public interface XMLAdapterExtensionPoint {
     /**
-     * @param <B>
-     * @param <A>
      * @param boundType
      * @param adapter
      */
-    <B, A extends XmlAdapter<?, B>> void addAdapter(Class<B> boundType, Class<A> adapter);
+    void addAdapter(Class<?> boundType, Class<? extends XmlAdapter> adapter);
+
     /**
-     * @param <B>
-     * @param <A>
      * @param boundType
      * @return
      */
-    <B, A extends XmlAdapter<?, B>> Class<A> getAdapter(Class<B> boundType);
+    Class<? extends XmlAdapter> getAdapter(Class<?> boundType);
 
     /**
-     * @param <B>
-     * @param <A>
      * @param boundType
      * @return
      */
-    <B, A extends XmlAdapter<?, B>> Class<A> removeAdapter(Class<B> boundType);
-    
+    Class<? extends XmlAdapter> removeAdapter(Class<?> boundType);
+
     /**
      * @return
      */
-    Map<Class<?>, Class<? extends XmlAdapter<?,?>>> getAdapters();
+    Map<Class<?>, Class<? extends XmlAdapter>> getAdapters();
 }