Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 9348)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 9349)
@@ -183,11 +183,12 @@
return new TimestampRange(minDate, maxDate);
} else {
- // I18n: Don't translate timestamp keyword
- throw new ParseError(tr("Expecting min/max after ''timestamp''"));
+ throw new ParseError("" + tr("Expecting {0} after {1}", "min/max", "timestamp"));
}
}
- }
- }
- return null;
+ } else {
+ throw new ParseError("" + tr("Expecting {0} after {1}", ":", "" + keyword + ""));
+ }
+ }
+ throw new IllegalStateException("Not expecting keyword " + keyword);
}
Index: /trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java (revision 9348)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java (revision 9349)
@@ -2,4 +2,5 @@
package org.openstreetmap.josm.actions.search;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
@@ -379,3 +380,13 @@
anonymous.match(anonymous.n2, true);
}
+
+ @Test
+ public void testFooTypeBar() throws Exception {
+ try {
+ SearchCompiler.compile("foo type bar");
+ throw new RuntimeException();
+ } catch (ParseError parseError) {
+ assertEquals("Expecting : after type", parseError.getMessage());
+ }
+ }
}