Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

File:

• trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -42 +42 @@
      * @since 4869
      */
-    private static final ArrayList<FileImporter> IMPORTERS;
+    private static final ArrayList<FileImporter> importers;
 
     /**
@@ -48 +48 @@
      * @since 4869
      */
-    private static final ArrayList<FileExporter> EXPORTERS;
+    private static final ArrayList<FileExporter> exporters;
 
     // add some file types only if the relevant classes are there.
@@ -56 +56 @@
     static {
 
-        IMPORTERS = new ArrayList<>();
+        importers = new ArrayList<>();
 
         final List<Class<? extends FileImporter>> importerNames = Arrays.asList(
@@ -73 +73 @@
             try {
                 FileImporter importer = importerClass.getConstructor().newInstance();
-                IMPORTERS.add(importer);
+                importers.add(importer);
             } catch (ReflectiveOperationException e) {
                 Main.debug(e);
@@ -95 +95 @@
         }
 
-        EXPORTERS = new ArrayList<>();
+        exporters = new ArrayList<>();
 
         final List<Class<? extends FileExporter>> exporterClasses = Arrays.asList(
@@ -110 +110 @@
             try {
                 FileExporter exporter = exporterClass.getConstructor().newInstance();
-                EXPORTERS.add(exporter);
+                exporters.add(exporter);
                 Main.getLayerManager().addAndFireActiveLayerChangeListener(exporter);
             } catch (ReflectiveOperationException e) {
@@ -147 +147 @@
     public static void addImporter(FileImporter importer) {
         if (importer != null) {
-            IMPORTERS.add(importer);
+            importers.add(importer);
         }
     }
@@ -158 +158 @@
     public static void addImporterFirst(FileImporter importer) {
         if (importer != null) {
-            IMPORTERS.add(0, importer);
+            importers.add(0, importer);
         }
     }
@@ -169 +169 @@
     public static void addExporter(FileExporter exporter) {
         if (exporter != null) {
-            EXPORTERS.add(exporter);
+            exporters.add(exporter);
         }
     }
@@ -180 +180 @@
     public static void addExporterFirst(FileExporter exporter) {
         if (exporter != null) {
-            EXPORTERS.add(0, exporter);
+            exporters.add(0, exporter);
         }
     }
@@ -190 +190 @@
      */
     public static List<FileImporter> getImporters() {
-        return Collections.unmodifiableList(IMPORTERS);
+        return Collections.unmodifiableList(importers);
     }
 
@@ -199 +199 @@
      */
     public static List<FileExporter> getExporters() {
-        return Collections.unmodifiableList(EXPORTERS);
+        return Collections.unmodifiableList(exporters);
     }
 
@@ -213 +213 @@
      */
     public static void updateAllFormatsImporter() {
-        for (int i = 0; i < IMPORTERS.size(); i++) {
-            if (IMPORTERS.get(i) instanceof AllFormatsImporter) {
-                IMPORTERS.set(i, new AllFormatsImporter());
+        for (int i = 0; i < importers.size(); i++) {
+            if (importers.get(i) instanceof AllFormatsImporter) {
+                importers.set(i, new AllFormatsImporter());
             }
         }
@@ -231 +231 @@
         updateAllFormatsImporter();
         List<ExtensionFileFilter> filters = new LinkedList<>();
-        for (FileImporter importer : IMPORTERS) {
+        for (FileImporter importer : importers) {
             filters.add(importer.filter);
         }
@@ -248 +248 @@
     public static List<ExtensionFileFilter> getExportExtensionFileFilters() {
         List<ExtensionFileFilter> filters = new LinkedList<>();
-        for (FileExporter exporter : EXPORTERS) {
+        for (FileExporter exporter : exporters) {
             if (filters.contains(exporter.filter) || !exporter.isEnabled()) {
                 continue;
@@ -267 +267 @@
     public static ExtensionFileFilter getDefaultImportExtensionFileFilter(String extension) {
         if (extension == null) return new AllFormatsImporter().filter;
-        for (FileImporter importer : IMPORTERS) {
+        for (FileImporter importer : importers) {
             if (extension.equals(importer.filter.getDefaultExtension()))
                 return importer.filter;
@@ -283 +283 @@
     public static ExtensionFileFilter getDefaultExportExtensionFileFilter(String extension) {
         if (extension == null) return new AllFormatsImporter().filter;
-        for (FileExporter exporter : EXPORTERS) {
+        for (FileExporter exporter : exporters) {
             if (extension.equals(exporter.filter.getDefaultExtension()))
                 return exporter.filter;
@@ -290 +290 @@
         // scan all supported extensions
         File file = new File("file." + extension);
-        for (FileExporter exporter : EXPORTERS) {
+        for (FileExporter exporter : exporters) {
             if (exporter.filter.accept(file))
                 return exporter.filter;