Index: applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/ExportTask.java =================================================================== --- applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/ExportTask.java (revision 31099) +++ applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/ExportTask.java (revision 33921) @@ -4,5 +4,4 @@ package org.openstreetmap.josm.plugins.sumoconvert; -import java.io.File; import java.io.IOException; import java.util.Properties; @@ -16,5 +15,4 @@ * */ - public class ExportTask extends PleaseWaitRunnable { @@ -30,29 +28,16 @@ } - /* (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,10 +46,9 @@ 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(); + } } - } Index: applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoConvertPlugin.java =================================================================== --- applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoConvertPlugin.java (revision 31099) +++ applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoConvertPlugin.java (revision 33921) @@ -1,15 +1,7 @@ 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,5 +11,4 @@ public class SumoConvertPlugin extends Plugin{ - private final ArrayList turnrestrictions = new ArrayList(); private SumoExportAction exportAction; @@ -25,25 +16,5 @@ 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); } } Index: applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportAction.java =================================================================== --- applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportAction.java (revision 31099) +++ applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportAction.java (revision 33921) @@ -9,11 +9,7 @@ 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,20 +26,7 @@ } - /* (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()); } - } Index: applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportDialog.java =================================================================== --- applications/editors/josm/plugins/sumoconvert/src/org/openstreetmap/josm/plugins/sumoconvert/SumoExportDialog.java (revision 31099) +++ (revision ) @@ -1,131 +1,0 @@ -/** - * - */ -package org.openstreetmap.josm.plugins.sumoconvert; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionListener; -import java.util.Enumeration; -import java.util.LinkedList; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.ListCellRenderer; - -import org.openstreetmap.josm.Main; - -/** - * Main export dialog - * @author ignacio_palermo - * - */ -public class SumoExportDialog extends JPanel { - // the JOptionPane that contains this dialog. required for the closeDialog() method. - private JOptionPane optionPane; - private JCheckBox delete; - private JComboBox portCombo; - - - public SumoExportDialog() { - GridBagConstraints c = new GridBagConstraints(); - JButton refreshBtn, configBtn; - - setLayout(new GridBagLayout()); - - portCombo = new JComboBox(); - - refreshPorts(); - c.insets = new Insets(4,4,4,4); - c.gridwidth = 1; - c.weightx = 0.8; - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 0; - add(new JLabel(tr("Port:")), c); - - c.gridwidth = 1; - c.gridx = 1; - c.gridy = 0; - c.weightx = 1.5; - add(portCombo, c); - - refreshBtn = new JButton(tr("Refresh")); - refreshBtn.addActionListener(new ActionListener(){ - public void actionPerformed(java.awt.event.ActionEvent e){ - refreshPorts(); - } - }); - refreshBtn.setToolTipText(tr("refresh the port list")); - c.gridwidth = 1; - c.weightx = 1.0; - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 2; - c.gridy = 0; - add(refreshBtn, c); - - configBtn = new JButton(tr("Configure")); - configBtn.addActionListener(new ActionListener(){ - public void actionPerformed(java.awt.event.ActionEvent e){ - System.out.println("configureing the device"); - try{ - - - - - - }catch(Exception ex){ - JOptionPane.showMessageDialog(Main.parent, tr("Connection Error.") + " " + ex.toString()); - } - System.out.println("configureing the device finised"); - } - }); - configBtn.setToolTipText(tr("configure the connected DG100")); - c.gridwidth = 1; - c.weightx = 1.0; - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 2; - c.gridy = 1; - add(configBtn, c); - - - delete = new JCheckBox(tr("delete data after import")); - delete.setSelected(Main.pref.getBoolean("globalsat.deleteAfterDownload", false)); - - c.gridwidth = 3; - c.fill = GridBagConstraints.HORIZONTAL; - c.gridx = 0; - c.gridy = 2; - add(delete, c); - } - - public void refreshPorts(){ - String sel = Main.pref.get("globalsat.portIdentifier"); - portCombo.setVisible(false); - portCombo.removeAllItems(); - portCombo.setVisible(true); - - } - - public boolean deleteFilesAfterDownload(){ - return delete.isSelected(); - } - - /** - * Has to be called after this dialog has been added to a JOptionPane. - * @param optionPane - */ - public void setOptionPane(JOptionPane optionPane) { - this.optionPane = optionPane; - } -}