Changeset 10407 in josm

Timestamp:

2016-06-16T20:07:17+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2386 - Mutable fields should not be "public static"

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (3 diffs)
• actions/GpxExportAction.java (modified) (1 diff)
• actions/OpenFileAction.java (modified) (2 diffs)
• actions/SaveActionBase.java (modified) (1 diff)
• io/AllFormatsImporter.java (modified) (1 diff)

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

@@ -34 +34 @@
      * @since 4869
      */
-    public static final ArrayList<FileImporter> importers;
+    private static final ArrayList<FileImporter> importers;
 
     /**
@@ -40 +40 @@
      * @since 4869
      */
-    public static final ArrayList<FileExporter> exporters;
+    private static final ArrayList<FileExporter> exporters;
 
     // add some file types only if the relevant classes are there.
@@ -140 +140 @@
 
     /**
+     * Adds a new file importer at the end of the global list. This importer will be evaluated after core ones.
+     * @param importer new file importer
+     * @since 10407
+     */
+    public static void addImporter(FileImporter importer) {
+        if (importer != null) {
+            importers.add(importer);
+        }
+    }
+
+    /**
+     * Adds a new file importer at the beginning of the global list. This importer will be evaluated before core ones.
+     * @param importer new file importer
+     * @since 10407
+     */
+    public static void addImporterFirst(FileImporter importer) {
+        if (importer != null) {
+            importers.add(0, importer);
+        }
+    }
+
+    /**
+     * Adds a new file exporter at the end of the global list. This exporter will be evaluated after core ones.
+     * @param exporter new file exporter
+     * @since 10407
+     */
+    public static void addExporter(FileExporter exporter) {
+        if (exporter != null) {
+            exporters.add(exporter);
+        }
+    }
+
+    /**
+     * Adds a new file exporter at the beginning of the global list. This exporter will be evaluated before core ones.
+     * @param exporter new file exporter
+     * @since 10407
+     */
+    public static void addExporterFirst(FileExporter exporter) {
+        if (exporter != null) {
+            exporters.add(0, exporter);
+        }
+    }
+
+    /**
+     * Returns the list of file importers.
+     * @return unmodifiable list of file importers
+     * @since 10407
+     */
+    public static List<FileImporter> getImporters() {
+        return Collections.unmodifiableList(importers);
+    }
+
+    /**
+     * Returns the list of file exporters.
+     * @return unmodifiable list of file exporters
+     * @since 10407
+     */
+    public static List<FileExporter> getExporters() {
+        return Collections.unmodifiableList(exporters);
+    }
+
+    /**
      * Updates the {@link AllFormatsImporter} that is contained in the importers list. If
      * you do not use the importers variable directly, you don’t need to call this.

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

@@ -85 +85 @@
             return;
 
-        for (FileExporter exporter : ExtensionFileFilter.exporters) {
+        for (FileExporter exporter : ExtensionFileFilter.getExporters()) {
             if (exporter.acceptFile(file, layer)) {
                 try {

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

@@ -238 +238 @@
             FileImporter chosenImporter = null;
             if (fileFilter != null) {
-                for (FileImporter importer : ExtensionFileFilter.importers) {
+                for (FileImporter importer : ExtensionFileFilter.getImporters()) {
                     if (fileFilter.equals(importer.filter)) {
                         chosenImporter = importer;
@@ -291 +291 @@
                 List<File> urlFiles = new LinkedList<>();
                 FILES: for (File f : files) {
-                    for (FileImporter importer : ExtensionFileFilter.importers) {
+                    for (FileImporter importer : ExtensionFileFilter.getImporters()) {
                         if (importer.acceptFile(f)) {
                             importerMap.put(importer, f);

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

@@ -93 +93 @@
             boolean exported = false;
             boolean canceled = false;
-            for (FileExporter exporter : ExtensionFileFilter.exporters) {
+            for (FileExporter exporter : ExtensionFileFilter.getExporters()) {
                 if (exporter.acceptFile(file, layer)) {
                     exporter.exportData(file, layer);

trunk/src/org/openstreetmap/josm/io/AllFormatsImporter.java

@@ -31 +31 @@
      */
     private static String getAllExtensions() {
-        Iterator<FileImporter> imp = ExtensionFileFilter.importers.iterator();
+        Iterator<FileImporter> imp = ExtensionFileFilter.getImporters().iterator();
         StringBuilder ext = new StringBuilder();
         while (imp.hasNext()) {