Changeset 35262 in osm for applications/editors/josm/plugins/surveyor/src/org

Timestamp:

2019-12-28T15:13:36+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm17563 - fix icon support, add unit test

Location:

applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor

Files:

• ButtonDescription.java (modified) (1 diff)
• SurveyorComponent.java (modified) (1 diff)
• SurveyorShowAction.java (modified) (4 diffs)
• action/PlayAudioAction.java (modified) (3 diffs)
• util/ResourceLoader.java (deleted)

applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/ButtonDescription.java

@@ -175 +175 @@
         String actionName = tr(getLabel()) + " (" + hotkey + ")";
 
-        Icon icon = ImageProvider.getIfAvailable(iconName);
-        if (icon == null)
-            icon = ImageProvider.getIfAvailable("markers", iconName);
-        if (icon == null)
-            icon = ImageProvider.getIfAvailable("symbols", iconName);
-        if (icon == null)
-            icon = ImageProvider.getIfAvailable("nodes", iconName);
+        Icon icon = null;
+        if (iconName != null) {
+            icon = ImageProvider.getIfAvailable(iconName);
+            if (icon == null)
+                icon = ImageProvider.getIfAvailable("markers", iconName);
+            if (icon == null)
+                icon = ImageProvider.getIfAvailable("symbols", iconName);
+            if (icon == null)
+                icon = ImageProvider.getIfAvailable("nodes", iconName);
+        }
 
         MetaAction action = new MetaAction(actionName, icon);

applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorComponent.java

@@ -64 +64 @@
      */
     public void setColumns(String columnsString) {
-        System.out.println("setting columns to " +columnsString);
         columns = Integer.parseInt(columnsString);
         buttonPanel.setLayout(new GridLayout(rows, columns));

applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/SurveyorShowAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.plugins.surveyor.util.ResourceLoader;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
@@ -107 +107 @@
     }
 
-    public SurveyorComponent createComponent() {
+    public static SurveyorComponent createComponent() {
         String source = Config.getPref().get("surveyor.source");
-        if (source == null || source.length() == 0) {
+        if (source == null || source.isEmpty()) {
             source = DEFAULT_SOURCE;
             Config.getPref().put("surveyor.source", DEFAULT_SOURCE);
-            // <FIXXME date="04.05.2007" author="cdaller">
-            // TODO copy xml file to .josm directory if it does not exist!
-            // </FIXXME>
         }
-        try (InputStream in = ResourceLoader.getInputStream(source)) {
+        try (CachedFile cf = new CachedFile(source); InputStream in = cf.getInputStream()) {
             return createComponent(in);
         } catch (IOException e) {
@@ -134 +131 @@
      * @throws SAXException if the xml could not be read.
      */
-    public SurveyorComponent createComponent(InputStream in) throws SAXException {
+    public static SurveyorComponent createComponent(InputStream in) throws SAXException {
         XmlObjectParser parser = new XmlObjectParser();
         parser.mapOnStart("surveyor", SurveyorComponent.class);
@@ -146 +143 @@
             Object object = parser.next();
             if (object instanceof SurveyorComponent) {
-                //System.out.println("SurveyorComponent " + object);
                 surveyorComponent = (SurveyorComponent) object;
             } else if (object instanceof ButtonDescription) {
-                //System.out.println("ButtonDescription " + object);
                 ((ButtonDescription) object).setActions(actions);
                 surveyorComponent.addButton(((ButtonDescription) object));
                 actions = new ArrayList<>();
             } else if (object instanceof SurveyorActionDescription) {
-                //System.out.println("SurveyorActionDescription " + object);
                 actions.add((SurveyorActionDescription) object);
             } else {

applications/editors/josm/plugins/surveyor/src/org/openstreetmap/josm/plugins/surveyor/action/PlayAudioAction.java

@@ -4 +4 @@
 import java.io.BufferedInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 import javax.sound.sampled.AudioFormat;
@@ -15 +14 @@
 
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.plugins.surveyor.GpsActionEvent;
-import org.openstreetmap.josm.plugins.surveyor.util.ResourceLoader;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -32 +31 @@
         // run as a separate thread
         MainApplication.worker.execute(() -> {
-            try {
-                if (audioSource == null) {
-                    audioSource = getParameters().get(0);
-                }
-                InputStream in = new BufferedInputStream(ResourceLoader.getInputStream(audioSource));
-                AudioInputStream stream = AudioSystem.getAudioInputStream(in);
+            if (audioSource == null) {
+                audioSource = getParameters().get(0);
+            }
+            try (CachedFile cf = new CachedFile(audioSource)) {
+                AudioInputStream stream = AudioSystem.getAudioInputStream(new BufferedInputStream(cf.getInputStream()));
 
                 // At present, ALAW and ULAW encodings must be converted