Changeset 34535 in osm

Timestamp:

2018-08-18T18:57:34+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/OpeningHoursEditor

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ohe/ClockSystem.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ohe/gui/OheEditor.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="commit.message" value="fixed main version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12643"/>
+    <property name="plugin.main.version" value="14153"/>
         
     <property name="plugin.author" value="Falko Thomale"/>

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/ClockSystem.java

@@ -6 +6 @@
 import java.util.Locale;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Logging;
 

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java

@@ -35 +35 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -47 +47 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.ohe.gui.OheDialogPanel;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -57 +58 @@
     /**
      * Strings for choosing which key of an object with given tags should be
-     * edited, the order is referencing the preference of the keys, String[] ->
+     * edited, the order is referencing the preference of the keys, String[] ->
      * {key, value, key-to-edit} key and value can contain regular expressions
      */
@@ -260 +261 @@
 
             // load the preference for the clocksystem (12h/24h)
-            ClockSystem clockSystem = ClockSystem.valueOf(Main.pref.get("ohe.clocksystem",
+            ClockSystem clockSystem = ClockSystem.valueOf(Config.getPref().get("ohe.clocksystem",
                     ClockSystem.getClockSystem(Locale.getDefault()).toString()));
 
@@ -275 +276 @@
             JOptionPane optionPane = new JOptionPane(dlgPanel, JOptionPane.QUESTION_MESSAGE,
                     JOptionPane.OK_CANCEL_OPTION);
-            JDialog dlg = optionPane.createDialog(Main.parent, tr("Choose key"));
+            JDialog dlg = optionPane.createDialog(MainApplication.getMainFrame(), tr("Choose key"));
             dlg.pack();
             dlg.setResizable(true);
@@ -295 +296 @@
 
             // save the value for the clocksystem (12h/24h)
-            Main.pref.put("ohe.clocksystem", (useTwelveHourClock.isSelected() ? ClockSystem.TWELVE_HOURS
+            Config.getPref().put("ohe.clocksystem", (useTwelveHourClock.isSelected() ? ClockSystem.TWELVE_HOURS
                     : ClockSystem.TWENTYFOUR_HOURS).toString());
 
@@ -302 +303 @@
 
             optionPane = new JOptionPane(panel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
-            dlg = optionPane.createDialog(Main.parent, tr("Edit"));
+            dlg = optionPane.createDialog(MainApplication.getMainFrame(), tr("Edit"));
             dlg.setResizable(true);
             dlg.setVisible(true);
@@ -328 +329 @@
                 return;
             if (key.equals(newkey) || value == null) {
-                Main.main.undoRedo.add(new ChangePropertyCommand(selection, newkey, value));
+                UndoRedoHandler.getInstance().add(new ChangePropertyCommand(selection, newkey, value));
             } else {
                 Collection<Command> commands = new Vector<>();
@@ -352 +353 @@
                     commands.add(new ChangePropertyCommand(selection, newkey, value));
                 }
-                Main.main.undoRedo.add(new SequenceCommand(trn("Change properties of up to {0} object",
+                UndoRedoHandler.getInstance().add(new SequenceCommand(trn("Change properties of up to {0} object",
                         "Change properties of up to {0} objects", selection.size(), selection.size()), commands));
             }

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java

@@ -18 +18 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.ohe.ClockSystem;
 import org.openstreetmap.josm.plugins.ohe.OhePlugin;

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheEditor.java

@@ -16 +16 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.ohe.ClockSystem;
 import org.openstreetmap.josm.plugins.ohe.OpeningTimeUtils;