Changeset 1467 in osm for utils/josm/plugins/osmarender

Timestamp:

2006-10-13T21:50:23+02:00 (18 years ago)

Author:

imi

Message:

added josm translation plugins and annotation-tester plugin

Location:

utils/josm/plugins/osmarender

Files:

• build.xml (modified) (1 diff)
• src/OsmarenderPlugin.java (modified) (3 diffs)

utils/josm/plugins/osmarender/build.xml

@@ -1 +1 @@
 <project name="osmarender" default="build" basedir=".">
 
-        <property name="josm" location="../../../../editors/josm/dist/josm-custom.jar" />
+        <!--property name="josm" location="../../../../editors/josm/dist/josm-custom.jar" /-->
+        <property name="josm" location="../../../../../josm/bin" />
+
         <property name="osmarender" location="../../../osmarender" />
         <property name="target" location="dist/osmarender.jar" />

utils/josm/plugins/osmarender/src/OsmarenderPlugin.java

@@ -64 +64 @@
                         }
 
-                        try {
-                                // store the stuff in data.osm
-                                OsmWriter.output(new FileOutputStream(getPluginDir()+"data.osm"), new OsmWriter.All(fromDataSet, true));
+                        String firefox = Main.pref.get("osmarender.firefox", "firefox");
+                        boolean retry = false;
+                        do {
+                                try {
+                                        retry = false;
 
-                                // launch up the viewer
-                                String firefox = Main.pref.get("osmarender.firefox", "firefox");
-                                Runtime.getRuntime().exec(firefox+" "+getPluginDir()+"osm-map-features.xml");
-                        } catch (IOException e1) {
-                                JOptionPane.showMessageDialog(Main.parent, "Could not launch Osmarender.");
-                        }
+                                        // write to plugin dir
+                                        OsmWriter.output(new FileOutputStream(getPluginDir()+"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")+"osm-map-features.xml\"";
+                                        else
+                                                exec += " "+getPluginDir()+"osm-map-features.xml";
+
+                                        // launch up the viewer
+                                        Runtime.getRuntime().exec(exec);
+                                } catch (IOException e1) {
+                                        firefox = JOptionPane.showInputDialog(Main.parent, "FireFox not found. Please enter location of firefox executable");
+                                        if (firefox != null) {
+                                                Main.pref.put("osmarender.firefox", firefox);
+                                                retry = true;
+                                        }
+                                }
+                        } while (retry);
                 }
         }
@@ -81 +97 @@
 
         public OsmarenderPlugin() throws IOException {
-                JMenuBar menu = Main.main.mainMenu;
+                JMenuBar menu = Main.main.menu;
                 view = null;
                 for (int i = 0; i < menu.getMenuCount(); ++i) {
@@ -91 +107 @@
                 if (view == null) {
                         view = new JMenu(tr("View"));
-                        Main.main.mainMenu.add(view, 1);
+                        menu.add(view, 2);
                         view.setVisible(false);
                 }