Changeset 12603 in osm for applications/editors/josm/plugins/osmarender/src

Timestamp:

2008-12-27T13:23:39+01:00 (16 years ago)

Author:

stoecker

Message:

fixed bug #1536

File:

• applications/editors/josm/plugins/osmarender/src/OsmarenderPlugin.java (modified) (8 diffs)

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

@@ -7 +7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.File;
 import java.util.Collection;
 import java.util.HashSet;
@@ -19 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -27 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -35 +38 @@
 public class OsmarenderPlugin extends Plugin {
 
-        private class Action extends AbstractAction {
+        private class Action extends JosmAction {
 
                 public Action() {
-                        super("Osmarender");
+                        super(tr("Osmarender"), null, tr("Osmarender"), null, true);
                 }
 
@@ -73 +76 @@
                         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
@@ -90 +93 @@
         }
 
-        private JMenu view;
-        private JMenuItem osmarenderMenu = new JMenuItem(new Action());
+        private JMenuItem osmarenderMenu;
 
         public OsmarenderPlugin() throws IOException {
-                JMenuBar menu = Main.main.menu;
-                view = null;
-                for (int i = 0; i < menu.getMenuCount(); ++i) {
-                        if (menu.getMenu(i) != null && tr("View").equals(menu.getMenu(i).getText())) {
-                                view = menu.getMenu(i);
-                                break;
-                        }
-                }
-                if (view == null) {
-                        view = new JMenu(tr("View"));
-                        menu.add(view, 2);
-                        view.setVisible(false);
-                }
-                view.add(osmarenderMenu);
+                osmarenderMenu = MainMenu.add(Main.main.menu.viewMenu, new Action());
                 osmarenderMenu.setVisible(false);
 
@@ -120 +109 @@
                         // disable
                         osmarenderMenu.setVisible(false);
-                        if (view.getMenuComponentCount() == 1)
-                                view.setVisible(false);
                 } else if (oldFrame == null && newFrame != null) {
                         // enable
                         osmarenderMenu.setVisible(true);
-                        if (view.getMenuComponentCount() == 1)
-                                view.setVisible(true);
                 }
         }
@@ -154 +139 @@
 
                 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