Changeset 33185 in osm for applications/editors/josm/plugins/OpeningHoursEditor

Timestamp:

2017-03-12T15:45:39+01:00 (8 years ago)

Author:

stoecker

Message:

fix #josm13596 - editor does not display existing data

Location:

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe

Files:

• gui/OheEditor.java (modified) (4 diffs)
• parser/OpeningTimeCompiler.jj (modified) (1 diff)

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;
@@ -33 +34 @@
                 g.setColor(Color.WHITE);
                 g.fillRect(0, 0, getWidth(), getHeight());
-                
+
                 // draw the time from 12PM to 00AM in a different color
                 if (dialog.getHourMode() == ClockSystem.TWELVE_HOURS) {
@@ -135 +136 @@
                 g.setColor(Color.WHITE);
                 g.fillRect(0, 0, getWidth(), getHeight());
-                
+
                 // draw the time from 12PM to 00AM in a different color
                 if (dialog.getHourMode() == ClockSystem.TWELVE_HOURS) {
@@ -186 +187 @@
             time = dialog.getTime();
         } catch (Exception exc) {
+            Main.warn(exc, "Disable opening hours editor:");
             setEnabled(false);
             return;

applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/parser/OpeningTimeCompiler.jj

@@ -60 +60 @@
    */
   public OpeningTimeCompiler(String time) {
-    this(new ByteArrayInputStream(time.getBytes()), null);
+    this(new ByteArrayInputStream(time.getBytes()), "utf-8");
   }
 }