Index: applications/editors/josm/plugins/OpeningHoursEditor/build.xml
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 30121)
+++ applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 30122)
@@ -15,5 +15,5 @@
-
+
Index: applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java (revision 30121)
+++ applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java (revision 30122)
@@ -24,4 +24,5 @@
import org.openstreetmap.josm.plugins.ohe.parser.ParseException;
import org.openstreetmap.josm.plugins.ohe.parser.SyntaxException;
+import org.openstreetmap.josm.plugins.ohe.parser.TokenMgrError;
import org.openstreetmap.josm.tools.GBC;
@@ -99,5 +100,5 @@
toolsPanel.add(Box.createGlue(), GBC.std().fill(GBC.HORIZONTAL));
toolsPanel.add(actualPostionLabel, GBC.eop());
-
+
editorPanel = new OheEditor(this);
@@ -132,6 +133,8 @@
time = OpeningTimeUtils.convert(compiler.startCompile());
} catch (Throwable t) {
+ Main.warn(t);
+
int tColumns[] = null;
- String info = null;
+ String info = t.getMessage();
if (t instanceof ParseException) {
@@ -141,27 +144,41 @@
SyntaxException syntaxError = (SyntaxException) t;
tColumns = new int[] { syntaxError.getStartColumn(), syntaxError.getEndColumn() };
- info = syntaxError.getMessage();
- } else {
- info = t.getMessage();
- Main.warn(t);
+ } else if (t instanceof TokenMgrError) {
+ try {
+ // With JavaCC 6 Message is: "Lexical error at line 1, column 20. Encountered: "P" (80), after : ""
+ int idx = info.indexOf("column ");
+ if (idx > -1) {
+ int col = Integer.parseInt(info.substring(idx+"column ".length(), info.indexOf('.', idx)));
+ tColumns = new int[] { col - 1, col + 1 };
+ }
+ } catch (IndexOutOfBoundsException e) {
+ Main.warn(e);
+ } catch (NumberFormatException e) {
+ Main.warn(e);
+ }
}
// shows a Information Dialog, where the Error occurred
- if (tColumns != null) {
- int first = Math.max(0, tColumns[0]);
- int last = Math.min(value.length(), tColumns[1]);
- String begin = value.substring(0, first);
- String middle = value.substring(first, last);
- String end = value.substring(last);
- valueField.setCaretPosition(first);
- // TODO focus on the valueField
- String message = "" + tr("There is something wrong in the value near:") + "
" + begin
- + "" + middle + "" + end;
- if (info != null)
- message += "
" + tr("Info: {0}", tr(info));
- message += "
" + tr("Correct the value manually and than press Enter.");
- message += "";
- JOptionPane.showMessageDialog(this, message, tr("Error in timeformat"),
- JOptionPane.INFORMATION_MESSAGE);
+ if (tColumns != null || info != null) {
+ String message = "";
+ if (tColumns != null) {
+ int first = Math.max(0, tColumns[0]);
+ int last = Math.min(value.length(), tColumns[1]);
+ String begin = value.substring(0, first);
+ String middle = value.substring(first, last);
+ String end = value.substring(last);
+ valueField.setCaretPosition(first);
+ // TODO focus on the valueField
+ message += tr("There is something wrong in the value near:") + "
" + begin
+ + "" + middle + "" + end;
+ }
+ if (info != null) {
+ if (tColumns != null) {
+ message += "
";
+ }
+ message += tr("Info: {0}", tr(info));
+ }
+ message += "
" + tr("Correct the value manually and than press Enter.") + "";
+ JOptionPane.showMessageDialog(this, message, tr("Error in timeformat"), JOptionPane.INFORMATION_MESSAGE);
}