Index: org/openstreetmap/josm/io/OsmApi.java =================================================================== --- org/openstreetmap/josm/io/OsmApi.java (revision 2180) +++ org/openstreetmap/josm/io/OsmApi.java (working copy) @@ -79,7 +79,7 @@ static public OsmApi getOsmApi() { String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api"); if (serverUrl == null) - throw new IllegalStateException(tr("preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url")); + throw new IllegalStateException(tr("Preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url")); return getOsmApi(serverUrl); } @@ -131,7 +131,7 @@ */ protected OsmApi(String serverUrl) { if (serverUrl == null) - throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "serverUrl")); + throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "serverUrl")); this.serverUrl = serverUrl; } @@ -250,7 +250,7 @@ ret = sendRequest("PUT", OsmPrimitiveType.from(osm).getAPIName()+"/create", toXml(osm, true),monitor); osm.setOsmId(Long.parseLong(ret.trim()), 1); } catch(NumberFormatException e){ - throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret)); + throw new OsmTransferException(tr("Unexpected format of id replied by the server. Got ''{0}''", ret)); } } @@ -276,7 +276,7 @@ osm.setOsmId(osm.getId(), Integer.parseInt(ret.trim())); } } catch(NumberFormatException e) { - throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret)); + throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. got ''{1}''", osm.getId(), ret)); } } @@ -310,7 +310,7 @@ */ public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException { if (changeset == null) - throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); + throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "changeset")); try { progressMonitor.beginTask((tr("Creating changeset..."))); initialize(progressMonitor); @@ -320,7 +320,7 @@ changeset.setId(Long.parseLong(ret.trim())); changeset.setOpen(true); } catch(NumberFormatException e){ - throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret)); + throw new OsmTransferException(tr("Unexpected format of id replied by the server. got ''{0}''", ret)); } progressMonitor.setCustomText((tr("Successfully opened changeset {0}",changeset.getId()))); } finally { @@ -342,7 +342,7 @@ */ public void updateChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { if (changeset == null) - throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); + throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "changeset")); if (monitor == null) { monitor = NullProgressMonitor.INSTANCE; } @@ -377,7 +377,7 @@ */ public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { if (changeset == null) - throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); + throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "changeset")); if (monitor == null) { monitor = NullProgressMonitor.INSTANCE; } @@ -595,7 +595,7 @@ if (changeset == null) throw new OsmTransferException(tr("Current changeset is null. Can't upload data.")); if (changeset.getId() <= 0) - throw new OsmTransferException(tr("id of current changeset > 0 required. Current id is {0}", changeset.getId())); + throw new OsmTransferException(tr("Id of current changeset > 0 required. Current id is {0}", changeset.getId())); } /** * Replies the changeset data uploads are currently directed to Index: org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- org/openstreetmap/josm/io/OsmChangesetParser.java (revision 2180) +++ org/openstreetmap/josm/io/OsmChangesetParser.java (working copy) @@ -69,16 +69,16 @@ // -- id String value = atts.getValue("id"); if (value == null) { - throwException(tr("missing mandatory attribute ''{0}''", "id")); + throwException(tr("Missing mandatory attribute ''{0}''", "id")); } long id = 0; try { id = Long.parseLong(value); } catch(NumberFormatException e) { - throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "id", value)); + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''", "id", value)); } if (id <= 0) { - throwException(tr("illegal nummeric value for attribute ''{0}''. Got ''{1}''", "id", id)); + throwException(tr("Illegal numeric value for attribute ''{0}''. Got ''{1}''", "id", id)); } current.setId(id); @@ -106,13 +106,13 @@ // -- open value = atts.getValue("open"); if (value == null) { - throwException(tr("missing mandatory attribute ''{0}''", "open")); + throwException(tr("Missing mandatory attribute ''{0}''", "open")); } else if (value.equals("true")) { current.setOpen(true); } else if (value.equals("false")) { current.setOpen(false); } else { - throwException(tr("illegal boolean value for attribute ''{0}''. Got ''{1}''", "open", value)); + throwException(tr("Illegal boolean value for attribute ''{0}''. Got ''{1}''", "open", value)); } // -- min_lon and min_lat @@ -125,13 +125,13 @@ try { minLon = Double.parseDouble(min_lon); } catch(NumberFormatException e) { - throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lon", min_lon)); + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''", "min_lon", min_lon)); } double minLat = 0; try { minLat = Double.parseDouble(min_lat); } catch(NumberFormatException e) { - throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lat", min_lat)); + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''", "min_lat", min_lat)); } current.setMin(new LatLon(minLat, minLon)); @@ -141,13 +141,13 @@ try { maxLon = Double.parseDouble(max_lon); } catch(NumberFormatException e) { - throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lon", max_lon)); + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''", "max_lon", max_lon)); } double maxLat = 0; try { maxLat = Double.parseDouble(max_lat); } catch(NumberFormatException e) { - throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lat", max_lat)); + throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''", "max_lat", max_lat)); } current.setMax(new LatLon(maxLon, maxLat)); } Index: org/openstreetmap/josm/io/OsmHistoryReader.java =================================================================== --- org/openstreetmap/josm/io/OsmHistoryReader.java (revision 2180) +++ org/openstreetmap/josm/io/OsmHistoryReader.java (working copy) @@ -65,16 +65,16 @@ protected long getMandatoryAttributeLong(Attributes attr, String name) throws SAXException{ String v = attr.getValue(name); if (v == null) { - throwException(tr("mandatory attribute ''{0}'' missing", name)); + throwException(tr("Mandatory attribute ''{0}'' missing", name)); } Long l = 0l; try { l = Long.parseLong(v); } catch(NumberFormatException e) { - throwException(tr("illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''", name, v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''", name, v)); } if (l < 0) { - throwException(tr("illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''", name, v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''", name, v)); } return l; } @@ -82,16 +82,16 @@ protected int getMandatoryAttributeInt(Attributes attr, String name) throws SAXException{ String v = attr.getValue(name); if (v == null) { - throwException(tr("mandatory attribute ''{0}'' missing", name)); + throwException(tr("Mandatory attribute ''{0}'' missing", name)); } Integer i = 0; try { i = Integer.parseInt(v); } catch(NumberFormatException e) { - throwException(tr("illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''", name, v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''", name, v)); } if (i < 0) { - throwException(tr("illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''", name, v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''", name, v)); } return i; } @@ -99,7 +99,7 @@ protected String getMandatoryAttributeString(Attributes attr, String name) throws SAXException{ String v = attr.getValue(name); if (v == null) { - throwException(tr("mandatory attribute ''{0}'' missing", name)); + throwException(tr("Mandatory attribute ''{0}'' missing", name)); } return v; } @@ -107,11 +107,11 @@ protected boolean getMandatoryAttributeBoolean(Attributes attr, String name) throws SAXException{ String v = attr.getValue(name); if (v == null) { - throwException(tr("mandatory attribute ''{0}'' missing", name)); + throwException(tr("Mandatory attribute ''{0}'' missing", name)); } if (v.equals("true")) return true; if (v.equals("false")) return false; - throwException(tr("illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''", name, v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''", name, v)); // not reached return false; } @@ -171,7 +171,7 @@ try { type = OsmPrimitiveType.fromApiTypeName(v); } catch(IllegalArgumentException e) { - throwException(tr("illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got ''{1}''", "type", v)); + throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got ''{1}''", "type", v)); } String role = getMandatoryAttributeString(atts, "role"); org.openstreetmap.josm.data.osm.history.RelationMember member = new org.openstreetmap.josm.data.osm.history.RelationMember(role, type,ref); Index: org/openstreetmap/josm/io/OsmReader.java =================================================================== --- org/openstreetmap/josm/io/OsmReader.java (revision 2180) +++ org/openstreetmap/josm/io/OsmReader.java (working copy) @@ -225,7 +225,7 @@ Collection list = ways.get(current.id); if (list == null) { throwException( - tr("found XML element element not as direct child of element ") + tr("Found XML element element not as direct child of element ") ); } if (atts.getValue("ref") == null) { @@ -415,7 +415,7 @@ if (id <= 0) throw new IllegalDataException ( tr( - "way with external id ''{0}'' includes missing node with external id ''{1}''", + "Way with external id ''{0}'' includes missing node with external id ''{1}''", externalWayId, id ) @@ -428,7 +428,7 @@ } w.setNodes(wayNodes); if (incomplete) { - logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the " + + logger.warning(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " + "loaded data and is therefore incomplete too", externalWayId, w.getNodesCount())); w.incomplete = true; ds.addPrimitive(w);