Changeset 33876 in osm for applications

Timestamp:

2017-11-22T00:44:00+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/OpeningHoursEditor

Files:

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

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="10580"/>
+    <property name="plugin.main.version" value="12643"/>
         
     <property name="plugin.author" value="Falko Thomale"/>

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -30 +31 @@
             midnight = localeFormat.format(stdFormat.parse("12:00 AM"));
         } catch (ParseException ignore) {
-            Main.trace(ignore);
+            Logging.trace(ignore);
         }
         if (midnight.contains("12"))

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

@@ -41 +41 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -77 +78 @@
     public OhePlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction(), false, 0);
+        MainMenu.add(MainApplication.getMenu().dataMenu, new OheMenuAction(), false, 0);
     }
 

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

@@ -27 +27 @@
 import org.openstreetmap.josm.plugins.ohe.parser.TokenMgrError;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 
 public class OheDialogPanel extends JPanel {
@@ -133 +134 @@
                 time = OpeningTimeUtils.convert(compiler.startCompile());
             } catch (Exception | TokenMgrError t) {
-                Main.warn(t);
+                Logging.warn(t);
                 
                 int[] tColumns = null;
@@ -153 +154 @@
                         }
                     } catch (IndexOutOfBoundsException e) {
-                        Main.warn(e);
+                        Logging.warn(e);
                     } catch (NumberFormatException e) {
-                        Main.warn(e);
+                        Logging.warn(e);
                     }
                 }

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.ohe.OpeningTimeUtils;
 import org.openstreetmap.josm.plugins.ohe.parser.OpeningTimeCompiler;
+import org.openstreetmap.josm.tools.Logging;
 
 public class OheEditor extends JPanel implements MouseListener, MouseMotionListener {
@@ -187 +188 @@
             time = dialog.getTime();
         } catch (Exception exc) {
-            Main.warn(exc, "Disable opening hours editor:");
+            Logging.log(Logging.LEVEL_WARN, "Disable opening hours editor:", exc);
             setEnabled(false);
             return;