Changeset 33921 in osm

Timestamp:

2017-11-26T15:59:06+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643 + clean up messed code copied from various plugins

Location:

applications/editors/josm/plugins/sumoconvert

Files:

• .classpath (modified) (1 diff)
• .project (added)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• README.template (deleted)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/sumoconvert/ExportTask.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/sumoconvert/SumoConvertPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportDialog.java (deleted)

applications/editors/josm/plugins/sumoconvert/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="src" path="test/src"/>
-        <!-- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-        <classpathentry kind="lib" path="/JOSM/dist/josm-custom.jar" sourcepath="/JOSM/src"/>
-        <classpathentry kind="lib" path="/JOSM/test/build" sourcepath="/JOSM/test/functional"/>
-        <classpathentry kind="lib" path="test/config"/>
-        <classpathentry kind="output" path="build"/> -->
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/sumoconvert/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/ExportTask.java

@@ -4 +4 @@
 package org.openstreetmap.josm.plugins.sumoconvert;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
@@ -16 +15 @@
  *
  */
-
 public class ExportTask extends PleaseWaitRunnable {
 
@@ -30 +28 @@
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.gui.PleaseWaitRunnable#cancel()
-         */
         @Override
         protected void cancel() {
                 // TODO Auto-generated method stub
-
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.gui.PleaseWaitRunnable#finish()
-         */
         @Override
         protected void finish() {
                 // TODO Auto-generated method stub
-
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.gui.PleaseWaitRunnable#realRun()
-         */
         @Override
-        protected void realRun() throws SAXException, IOException,
-                        OsmTransferException {
-                
+        protected void realRun() throws SAXException, IOException, OsmTransferException {
                 try {
                         Runtime.getRuntime().exec(sumoConvertProperties.getProperty("resources") +
@@ -61 +46 @@
                                                                           sumoConvertProperties.getProperty("netconvert.plainoutput"),
                                                                           null, 
-                                                                          null//new File("C:\\Users\\ignacio_palermo\\AppData\\Roaming\\JOSM\\plugins\\sumoconvert")//resources
+                                                                          null
                         );                      
                 } catch (IOException e) {
-                     e.printStackTrace();
-                    }
+                    e.printStackTrace();
+                }
         }
-
 }

applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoConvertPlugin.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.sumoconvert;
 
-import java.util.ArrayList;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.turnrestrictions.list.TurnRestrictionsListDialog;
-import org.openstreetmap.josm.plugins.turnrestrictions.preferences.PreferenceEditor;
-import org.openstreetmap.josm.plugins.turnrestrictions.*;
 
 /**
@@ -19 +11 @@
 public class SumoConvertPlugin extends Plugin{
     
-        private final ArrayList<Relation> turnrestrictions = new ArrayList<Relation>();
         private SumoExportAction exportAction;
         
@@ -25 +16 @@
         super(info);
         exportAction = new SumoExportAction();
-        Main.main.menu.toolsMenu.add(exportAction);
-        System.out.println(getPluginDir());
-    }
-    
-    /**
-     * Called when the JOSM map frame is created or destroyed. 
-     */
-    @Override
-    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {             
-        if (oldFrame == null && newFrame != null) { // map frame added
-                
-            //TurnRestrictionsListDialog dialog  = new TurnRestrictionsListDialog();
-            //add the dialog
-            //newFrame.addToggleDialog(dialog);
-            //CreateOrEditTurnRestrictionAction.getInstance();
-        }
-    }
-
-    @Override
-    public PreferenceSetting getPreferenceSetting() {
-        return new PreferenceEditor();
+        MainApplication.getMenu().toolsMenu.add(exportAction);
     }
 }

applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportAction.java

@@ -9 +9 @@
 import java.awt.event.KeyEvent;
 
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Shortcut;
-
 
 /**
@@ -30 +26 @@
     }
 
-        /* (non-Javadoc)
-         * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
-         */
         @Override
-        public void actionPerformed(ActionEvent arg0) {
-                SumoExportDialog dialog = new SumoExportDialog();
-        JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-        JDialog dlg = pane.createDialog(Main.parent, tr("Export"));
-        dialog.setOptionPane(pane);
-        dlg.setVisible(true);
-        if(((Integer)pane.getValue()) == JOptionPane.OK_OPTION){
-            ExportTask task = new ExportTask();
-            Main.worker.execute(task);
-        }
-        dlg.dispose();
+        public void actionPerformed(ActionEvent e) {
+        MainApplication.worker.execute(new ExportTask());
         }
-
 }