svn commit: r1824851 - in /sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb: Context.java FilterByVersion.java

[desruisseaux]

Author: desruisseaux
Date: Tue Feb 20 11:16:43 2018
New Revision: 1824851

URL: http://svn.apache.org/viewvc?rev=1824851&view=rev
Log:
Remove FilteredByVersion.enable(). Not needed anymore since metadata 
implementation avoid invoking FilterByVersion in public non-deprecated methods.

Modified:
    
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
    
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java

Modified: 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java?rev=1824851&r1=1824850&r2=1824851&view=diff
==============================================================================
--- 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
 [UTF-8] Tue Feb 20 11:16:43 2018
@@ -114,14 +114,6 @@ public final class Context extends Marsh
     public static final Logger LOGGER = Logging.getLogger(Loggers.XML);
 
     /**
-     * Notifies {@code FilterByVersion} that (un)marshalling process may 
happen.
-     * This is used for avoiding classes loading before this possibility 
exists.
-     */
-    static {
-        FilterByVersion.enable();
-    }
-
-    /**
      * Various boolean attributes determines by the above static constants.
      */
     final int bitMasks;

Modified: 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
URL: 
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java?rev=1824851&r1=1824850&r2=1824851&view=diff
==============================================================================
--- 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
 [UTF-8] (original)
+++ 
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
 [UTF-8] Tue Feb 20 11:16:43 2018
@@ -46,12 +46,6 @@ public enum FilterByVersion {
                      Context.MARSHALLING | Context.LEGACY_METADATA);
 
     /**
-     * {@code true} if the {@link Context} class has been initialized.
-     * This is used as a filter for the common case where XML marshalling is 
not used at all.
-     */
-    private static volatile boolean enabled;
-
-    /**
      * Mask to apply on {@link Context#bitMasks} in order to determine the 
version of the XML document
      * being marshalled.
      */
@@ -74,14 +68,6 @@ public enum FilterByVersion {
     }
 
     /**
-     * Invoked by {@link Context} class initializer for notifying this {@code 
FilterByVersion} class
-     * that XML marshalling may happen at any time in the future.
-     */
-    static void enable() {
-        enabled = true;
-    }
-
-    /**
      * Returns {@code true} if we are marshalling the metadata or GML format 
identified by this constant,
      * or if no marshalling is in progress.
      *
@@ -89,7 +75,6 @@ public enum FilterByVersion {
      *         by this enumeration value.
      */
     public boolean accept() {
-        if (!enabled) return true;
         final Context context = Context.current();
         return (context == null) || (context.bitMasks & mask) != exclude;
     }