Changeset 29635 in osm

Timestamp:

2013-06-07T00:43:13+02:00 (11 years ago)

Author:

donvip

Message:

[josm_osmarenderer] Make plugin work under Windows with latest Java

Location:

applications/editors/josm/plugins/osmarender

Files:

• .project (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/osmarender/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>osmarender</name>
+        <name>JOSM-osmarender</name>
         <comment></comment>
         <projects>

applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java

@@ -41 +41 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
 
 public class OsmarenderPlugin extends Plugin {
@@ -107 +108 @@
 
                 // get the exec line
-                String exec = firefox;
-                if (System.getProperty("os.name").startsWith("Windows"))
-                    exec += " file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+File.separator+"generated.xml\"";
+                String argument; 
+                if (Main.platform instanceof PlatformHookWindows)
+                    argument = "file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+File.separator+"generated.xml\"";
                 else
-                    exec += " "+getPluginDir()+File.separator+"generated.xml";
+                    argument = getPluginDir()+File.separator+"generated.xml";
 
                 // launch up the viewer
-                Runtime.getRuntime().exec(exec);
+                Runtime.getRuntime().exec(new String[]{firefox, argument});
             } catch (IOException e1) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Firefox not found. Please set firefox executable in the Map Settings page of the preferences."));