Changeset 34005 in osm for applications/editors/josm/plugins/indoorhelper/src/org

Timestamp:

2018-01-13T18:19:22+01:00 (8 years ago)

Author:

donvip

Message:

code cleanup

File:

• applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java (modified) (7 diffs)

applications/editors/josm/plugins/indoorhelper/src/org/openstreetmap/josm/plugins/indoorhelper/IndoorHelperPlugin.java

@@ -40 +40 @@
 import controller.IndoorHelperController;
 
-
 /**
  * This is the main class for the indoorhelper plug-in.
@@ -50 +49 @@
 public class IndoorHelperPlugin extends Plugin implements PaintableInvalidationListener, ActiveLayerChangeListener {
 
-
-        @SuppressWarnings("unused")
+    @SuppressWarnings("unused")
     private IndoorHelperController controller;
     String sep = System.getProperty("file.separator");
@@ -91 +89 @@
      * Exports the mapcss validator file to the preferences directory.
      */
-    @SuppressWarnings("deprecation")
-        private void exportValidator(String resourceName) throws Exception {
+    private void exportValidator(String resourceName) throws Exception {
         InputStream stream = null;
         OutputStream resStreamOut = null;
@@ -107 +104 @@
             byte[] buffer = new byte[4096];
 
-            String valDirPath = Main.pref.getUserDataDirectory() + sep + "validator";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "validator";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
@@ -129 +126 @@
      */
     private void exportStyleFile(String resourceName) throws Exception {
-        InputStream stream = null;
-        OutputStream resStreamOut = null;
-
-        try {
-            stream = IndoorHelperPlugin.class.getResourceAsStream("/data/" + resourceName);
+        try (InputStream stream = IndoorHelperPlugin.class.getResourceAsStream("/data/" + resourceName)) {
             if (stream == null) {
                 System.out.println("MapPaint: stream is null");
@@ -143 +136 @@
             byte[] buffer = new byte[4096];
 
-            @SuppressWarnings("deprecation")
-                        String valDirPath = Main.pref.getUserDataDirectory() + sep + "styles";
+            String valDirPath = Main.pref.getDirs().getUserDataDirectory(true) + sep + "styles";
             File valDir = new File(valDirPath);
             valDir.mkdirs();
             outPath = valDir.getAbsolutePath() +sep+ resourceName;
-            System.out.println("MapPaint"+outPath);
-
-            resStreamOut = new FileOutputStream(outPath);
-            while ((readBytes = stream.read(buffer)) > 0) {
-                resStreamOut.write(buffer, 0, readBytes);
-            }
-            resStreamOut.close();
+
+            try (OutputStream resStreamOut = new FileOutputStream(outPath)) {
+                while ((readBytes = stream.read(buffer)) > 0) {
+                    resStreamOut.write(buffer, 0, readBytes);
+                }
+            }
         } catch (Exception ex) {
             throw ex;
-        } finally {
-            stream.close();
-        }
-    }
-
-        @Override
-        public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-                OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
+        }
+    }
+
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         if (editLayer != null) {
             editLayer.addInvalidationListener(this);
         }
-        }
-
-        @Override
-        public void paintableInvalidated(PaintableInvalidationEvent event){
-                AutoFilter currentAutoFilter = AutoFilterManager.getInstance().getCurrentAutoFilter();
-                String currentFilterValue = new String();
-
-                if(currentAutoFilter != null) {
-                        currentFilterValue = currentAutoFilter.getFilter().text.split("=")[1];
-
-                        this.controller.setIndoorLevel(currentFilterValue);
-                        this.controller.getIndoorLevel(currentFilterValue);
-                        this.controller.unsetSpecificKeyFilter("repeat_on");
-
-                }else{
-                        currentFilterValue = "";
-                        this.controller.setIndoorLevel(currentFilterValue);
-                        this.controller.getIndoorLevel(currentFilterValue);
-                };
-
-        }
+    }
+
+    @Override
+    public void paintableInvalidated(PaintableInvalidationEvent event) {
+        AutoFilter currentAutoFilter = AutoFilterManager.getInstance().getCurrentAutoFilter();
+        String currentFilterValue = new String();
+
+        if (currentAutoFilter != null) {
+            currentFilterValue = currentAutoFilter.getFilter().text.split("=")[1];
+
+            this.controller.setIndoorLevel(currentFilterValue);
+            this.controller.getIndoorLevel(currentFilterValue);
+            this.controller.unsetSpecificKeyFilter("repeat_on");
+
+        } else {
+            currentFilterValue = "";
+            this.controller.setIndoorLevel(currentFilterValue);
+            this.controller.getIndoorLevel(currentFilterValue);
+        }
+    }
 
     /**
@@ -232 +220 @@
 //        }
 //    }
-
-/**
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 }