You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/01/02 04:24:25 UTC

svn commit: r1554729 - /sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java

Author: desruisseaux
Date: Thu Jan  2 03:24:25 2014
New Revision: 1554729

URL: http://svn.apache.org/r1554729
Log:
Removed a temporary hack which is not needed anymore.

Modified:
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java?rev=1554729&r1=1554728&r2=1554729&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingTypes.java [UTF-8] Thu Jan  2 03:24:25 2014
@@ -36,23 +36,6 @@ public final class ReferencingTypes exte
      */
     @Override
     public void getTypes(final Collection<Class<?>> addTo) {
-        if (exists(addTo)) return;
         addTo.add(AbstractIdentifiedObject.class);
     }
-
-    /**
-     * Temporary workaround for avoiding a conflict between SIS and Geotk JAXB annotations.
-     * To be removed after we finished the port of Geotk referencing module to Apache SIS.
-     *
-     * @deprecated To be removed after sis-referencing completion.
-     */
-    @Deprecated
-    private static boolean exists(final Collection<Class<?>> addTo) {
-        for (final Class<?> type : addTo) {
-            if (org.opengis.referencing.crs.CoordinateReferenceSystem.class.isAssignableFrom(type)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }