Changeset 34509 in osm for applications


Ignore:
Timestamp:
2018-08-18T17:14:22+02:00 (6 years ago)
Author:
donvip
Message:

update to JOSM 14153

Location:
applications/editors/josm/plugins/ext_tools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/ext_tools/build.xml

    r33889 r34509  
    55    <property name="commit.message" value="ExtTools: help shortcut paser, rebuild"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="13007"/>
     7    <property name="plugin.main.version" value="14153"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).
  • applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java

    r33698 r34509  
    1313import org.openstreetmap.josm.command.ChangeNodesCommand;
    1414import org.openstreetmap.josm.command.Command;
    15 import org.openstreetmap.josm.data.osm.*;
     15import org.openstreetmap.josm.data.osm.DataSet;
     16import org.openstreetmap.josm.data.osm.Node;
     17import org.openstreetmap.josm.data.osm.OsmPrimitive;
     18import org.openstreetmap.josm.data.osm.PrimitiveId;
     19import org.openstreetmap.josm.data.osm.Relation;
     20import org.openstreetmap.josm.data.osm.RelationMember;
     21import org.openstreetmap.josm.data.osm.Way;
    1622import org.openstreetmap.josm.gui.MainApplication;
    1723
  • applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java

    r33889 r34509  
    2121import javax.swing.SwingUtilities;
    2222
    23 import org.openstreetmap.josm.Main;
    2423import org.openstreetmap.josm.command.Command;
    2524import org.openstreetmap.josm.command.SequenceCommand;
     
    3837import org.openstreetmap.josm.tools.Logging;
    3938
     39import org.openstreetmap.josm.data.UndoRedoHandler;
     40
    4041public class ExtTool {
    4142
     
    156157                p.add(new JScrollPane(info), GBC.eop());
    157158            }
    158             JOptionPane.showMessageDialog(Main.parent, p, tr("External tool error"), JOptionPane.ERROR_MESSAGE);
     159            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), p, tr("External tool error"), JOptionPane.ERROR_MESSAGE);
    159160        });
    160161    }
     
    236237                final List<Command> cmdlist = new DataSetToCmd(ds).getCommandList();
    237238                if (!cmdlist.isEmpty()) {
    238                     Main.main.undoRedo.add(new SequenceCommand(getName(), cmdlist));
     239                    UndoRedoHandler.getInstance().add(new SequenceCommand(getName(), cmdlist));
    239240                }
    240241            } catch (IllegalDataException e) {
  • applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java

    r22531 r34509  
    1313import javax.swing.JTextField;
    1414
    15 import org.openstreetmap.josm.Main;
    1615import org.openstreetmap.josm.gui.ExtendedDialog;
    1716import org.openstreetmap.josm.tools.GBC;
    1817
    1918import ext_tools.ExtTool;
     19import org.openstreetmap.josm.gui.MainApplication;
    2020
    2121public class EditToolDialog extends ExtendedDialog {
     
    4444
    4545    public EditToolDialog(ExtTool tool) {
    46         super(Main.parent, tr("Edit tool"),
     46        super(MainApplication.getMainFrame(), tr("Edit tool"),
    4747                new String[] { tr("OK"), tr("Cancel") },
    4848                true);
  • applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java

    r33698 r34509  
    1515import javax.swing.JPanel;
    1616
    17 import org.openstreetmap.josm.Main;
    18 
    1917import ext_tools.ExtTool;
    2018import ext_tools.ToolsInformation;
     19import org.openstreetmap.josm.gui.MainApplication;
    2120
    2221public class MyToolsPanel extends JPanel {
     
    6665                @Override
    6766                public void actionPerformed(ActionEvent arg0) {
    68                     if (JOptionPane.showConfirmDialog(Main.parent,
     67                    if (JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
    6968                            tr("Delete tool \"{0}\"?", tool.name),
    7069                            tr("Are you sure?"),
Note: See TracChangeset for help on using the changeset viewer.