Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 6806) @@ -211,5 +211,5 @@ private static final Collection mapFrameListeners = new ArrayList(); - protected static final Map networkErrors = new HashMap(); + protected static final Map NETWORK_ERRORS = new HashMap(); /** @@ -1449,5 +1449,5 @@ public static Throwable addNetworkError(String url, Throwable t) { if (url != null && t != null) { - return networkErrors.put(url, t); + return NETWORK_ERRORS.put(url, t); } return null; @@ -1460,5 +1460,5 @@ */ public static Map getNetworkErrors() { - return new HashMap(networkErrors); + return new HashMap(NETWORK_ERRORS); } } Index: trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/actions/relation/EditRelationAction.java (revision 6806) @@ -69,13 +69,12 @@ public void actionPerformed(ActionEvent e) { if (!isEnabled() || relations.isEmpty()) return; - if (relations.size() > Main.pref.getInteger("warn.open.maxrelations", 5)) { + if (relations.size() > Main.pref.getInteger("warn.open.maxrelations", 5) && /* I18N english text for value 1 makes no real sense, never called for values <= maxrel (usually 5) */ - if (JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(Main.parent, + JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(Main.parent, ""+trn("You are about to open {0} different relation editor simultaneously.
Do you want to continue?", "You are about to open {0} different relation editors simultaneously.
Do you want to continue?", relations.size(), relations.size())+"", tr("Confirmation"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)) { - return; - } + return; } for (Relation r : relations) { Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6806) @@ -524,8 +524,8 @@ private boolean handleNetworkErrors() { - boolean condition = !networkErrors.isEmpty(); + boolean condition = !NETWORK_ERRORS.isEmpty(); if (condition) { Set errors = new TreeSet(); - for (Throwable t : networkErrors.values()) { + for (Throwable t : NETWORK_ERRORS.values()) { errors.add(t.toString()); } @@ -537,5 +537,5 @@ "It may result of a missing proxy configuration.
" + "Would you like to change your proxy settings now?", - Utils.joinAsHtmlUnorderedList(networkErrors.keySet()), + Utils.joinAsHtmlUnorderedList(NETWORK_ERRORS.keySet()), Utils.joinAsHtmlUnorderedList(errors) )); Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6806) @@ -266,5 +266,4 @@ } else { // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104! - //decision.keepAll(); } } Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 6806) @@ -185,6 +185,6 @@ @Override protected String createInfoUrl(Object infoObject) { - HistoryOsmPrimitive primitive = (HistoryOsmPrimitive) infoObject; - return primitive.getUser() == null ? null : getBaseBrowseUrl() + "/user/" + primitive.getUser().getName(); + HistoryOsmPrimitive hp = (HistoryOsmPrimitive) infoObject; + return hp.getUser() == null ? null : getBaseBrowseUrl() + "/user/" + hp.getUser().getName(); } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6806) @@ -538,5 +538,5 @@ return s == null ? null : URLEncoder.encode(s, "UTF-8"); } catch (UnsupportedEncodingException ex) { - throw new RuntimeException(); + throw new RuntimeException(ex); } } Index: trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 6806) @@ -124,5 +124,5 @@ * The unique instance. */ - public final static RulePrefHelper INSTANCE = new RulePrefHelper(); + public static final RulePrefHelper INSTANCE = new RulePrefHelper(); /** Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 6806) @@ -71,4 +71,45 @@ return result; } + + private static class GeometryPrimitiveVisitor implements PrimitiveVisitor { + + private final JsonObjectBuilder geomObj; + + public GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) { + this.geomObj = geomObj; + } + + @Override + public void visit(INode n) { + geomObj.add("type", "Point"); + LatLon ll = n.getCoor(); + if (ll != null) { + geomObj.add("coordinates", getCoorArray(n.getCoor())); + } + } + + @Override + public void visit(IWay w) { + geomObj.add("type", "LineString"); + if (w instanceof Way) { + JsonArrayBuilder array = Json.createArrayBuilder(); + for (Node n : ((Way)w).getNodes()) { + LatLon ll = n.getCoor(); + if (ll != null) { + array.add(getCoorArray(ll)); + } + } + geomObj.add("coordinates", array); + } + } + + @Override + public void visit(IRelation r) { + } + + private JsonArrayBuilder getCoorArray(LatLon c) { + return Json.createArrayBuilder().add(c.lon()).add(c.lat()); + } + } protected static void appendPrimitive(OsmPrimitive p, JsonArrayBuilder array) { @@ -87,37 +128,5 @@ // Geometry final JsonObjectBuilder geomObj = Json.createObjectBuilder(); - p.accept(new PrimitiveVisitor() { - @Override - public void visit(INode n) { - geomObj.add("type", "Point"); - LatLon ll = n.getCoor(); - if (ll != null) { - geomObj.add("coordinates", getCoorArray(n.getCoor())); - } - } - - @Override - public void visit(IWay w) { - geomObj.add("type", "LineString"); - if (w instanceof Way) { - JsonArrayBuilder array = Json.createArrayBuilder(); - for (Node n : ((Way)w).getNodes()) { - LatLon ll = n.getCoor(); - if (ll != null) { - array.add(getCoorArray(ll)); - } - } - geomObj.add("coordinates", array); - } - } - - @Override - public void visit(IRelation r) { - } - - private JsonArrayBuilder getCoorArray(LatLon c) { - return Json.createArrayBuilder().add(c.lon()).add(c.lat()); - } - }); + p.accept(new GeometryPrimitiveVisitor(geomObj)); // Build primitive JSON object Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6805) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6806) @@ -65,4 +65,9 @@ public static final Charset UTF_8 = Charset.forName("UTF-8"); + private static final int MILLIS_OF_SECOND = 1000; + private static final int MILLIS_OF_MINUTE = 60000; + private static final int MILLIS_OF_HOUR = 3600000; + private static final int MILLIS_OF_DAY = 86400000; + /** * Tests whether {@code predicate} applies to at least one elements from {@code collection}. @@ -830,8 +835,4 @@ */ public static String getDurationString(long elapsedTime) throws IllegalArgumentException { - final int MILLIS_OF_SECOND = 1000; - final int MILLIS_OF_MINUTE = 60000; - final int MILLIS_OF_HOUR = 3600000; - final int MILLIS_OF_DAY = 86400000; if (elapsedTime < 0) { throw new IllegalArgumentException("elapsedTime must be > 0");