Changeset 30362 in osm for applications

Timestamp:

2014-03-24T22:30:15+01:00 (11 years ago)

Author:

donvip

Message:

[josm_surveyor] code cleanup, https links support

Location:

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor

Files:

• action/PlayAudioAction.java (modified) (1 diff)
• util/ResourceLoader.java (modified) (2 diffs)

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java

@@ -48 +48 @@
                     AudioInputStream stream = AudioSystem.getAudioInputStream(in);
 
-                    // From URL
-//                  stream = AudioSystem.getAudioInputStream(new URL("http://hostname/audiofile"));
-
                     // At present, ALAW and ULAW encodings must be converted
                     // to PCM_SIGNED before it can be played

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java

@@ -30 +30 @@
     public static InputStream getInputStream(String source) throws IOException {
         InputStream in = null;
-        if (source.startsWith("http://") || source.startsWith("ftp://") || source.startsWith("file:")) {
+        if (source.startsWith("http://") || source.startsWith("https://") || source.startsWith("ftp://") || source.startsWith("file:")) {
             in = new URL(source).openStream();
         } else if (source.startsWith("resource://")) {
@@ -40 +40 @@
         return in;
     }
-
 }