Ticket #1536: file-separator.patch

OsmarenderPlugin.java

@@ -6 +6 @@
 import java.io.PrintWriter;
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.File;
 import java.util.Collection;
 import java.util.HashSet;
 
@@ -72 +73 @@
                         String firefox = Main.pref.get("osmarender.firefox", "firefox");
                         try {
                                 // write to plugin dir
-                                OsmWriter.output(new FileOutputStream(getPluginDir()+"data.osm"), new OsmWriter.All(fromDataSet, true));
+                                OsmWriter.output(new FileOutputStream(getPluginDir()+File.separator+"data.osm"), new OsmWriter.All(fromDataSet, true));
 
                                 // get the exec line
                                 String exec = firefox;
                                 if (System.getProperty("os.name").startsWith("Windows"))
-                                        exec += " file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+"generated.xml\"";
+                                        exec += " file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+File.separator+"generated.xml\"";
                                 else
-                                        exec += " "+getPluginDir()+"generated.xml";
+                                        exec += " "+getPluginDir()+File.separator+"generated.xml";
 
                                 // launch up the viewer
                                 Runtime.getRuntime().exec(exec);
@@ -152 +153 @@
                         "maxlon=\"" + b.max.lon() + "\" " + "/>";
 
                 BufferedReader reader = new BufferedReader(
-                                new FileReader( getPluginDir() + "osm-map-features.xml") );
-                PrintWriter writer = new PrintWriter( getPluginDir() + "generated.xml");
+                                new FileReader( getPluginDir() + File.separator + "osm-map-features.xml") );
+                PrintWriter writer = new PrintWriter( getPluginDir() + File.separator + "generated.xml");
 
                 // osm-map-fetaures.xml contain two placemark
                 // (bounds_mkr1 and bounds_mkr2). We write the bounds tag