Changeset 2181 in josm


Ignore:
Timestamp:
Sep 22, 2009 3:34:19 PM (4 years ago)
Author:
stoecker
Message:

lots of i18n fixes

Location:
trunk/src/org/openstreetmap/josm
Files:
69 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

    r2163 r2181  
    6868    public void export(Layer layer) { 
    6969        if (layer == null) 
    70             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     70            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    7171        if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer)) 
    72             throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName())); 
     72            throw new IllegalArgumentException(tr("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName())); 
    7373 
    7474        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), ".gpx"); 

  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r2113 r2181  
    138138    public static Command mergeNodes(OsmDataLayer layer, Collection<Node> nodes, Node targetNode) throws IllegalArgumentException{ 
    139139        if (layer == null) 
    140             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "nodes")); 
     140            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "nodes")); 
    141141        if (targetNode == null) 
    142             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "targetNode")); 
     142            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "targetNode")); 
    143143 
    144144        if (nodes == null) 
    … …  
    220220    public static Command mergeNodes(OsmDataLayer layer, BackreferencedDataSet backreferences, Collection<Node> nodes, Node targetNode) { 
    221221        if (layer == null) 
    222             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "nodes")); 
     222            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "nodes")); 
    223223        if (targetNode == null) 
    224             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "targetNode")); 
     224            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "targetNode")); 
    225225        if (nodes == null) 
    226226            return null; 

  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r2175 r2181  
    251251            default: 
    252252                // should not happen 
    253                 throw new IllegalStateException(tr("unexpected return value. Got {0}", ret)); 
     253                throw new IllegalStateException(tr("Unexpected return value. Got {0}.", ret)); 
    254254        } 
    255255    } 
    … …  
    290290            default: 
    291291                // should not happen 
    292                 throw new IllegalStateException(tr("unexpected return value. Got {0}", ret)); 
     292                throw new IllegalStateException(tr("Unexpected return value. Got {0}.", ret)); 
    293293        } 
    294294    } 

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r2026 r2181  
    291291    public static void deleteRelation(OsmDataLayer layer, Relation toDelete) { 
    292292        if (layer == null) 
    293             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     293            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    294294        if (toDelete == null) 
    295             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "toDelete")); 
     295            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "toDelete")); 
    296296 
    297297        Command cmd = DeleteCommand.delete(layer, Collections.singleton(toDelete)); 

  • trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

    r2025 r2181  
    6767        } else 
    6868            // should not happen 
    69             throw new IllegalStateException(tr("cannot resolve undecided conflict")); 
     69            throw new IllegalStateException(tr("Cannot resolve undecided conflict.")); 
    7070 
    7171        // remember the layer this command was applied to 

  • trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

    r2070 r2181  
    7777        } else 
    7878            // should not happen 
    79             throw new IllegalStateException(tr("cannot resolve undecided conflict")); 
     79            throw new IllegalStateException(tr("Cannot resolve undecided conflict.")); 
    8080 
    8181        rememberConflict(conflict); 

  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r2017 r2181  
    7676    protected void addConflict(Conflict<?> conflict) throws IllegalStateException { 
    7777        if (hasConflictForMy(conflict.getMy())) 
    78             throw new IllegalStateException(tr("already registered a conflict for primitive ''{0}''", conflict.getMy().toString())); 
     78            throw new IllegalStateException(tr("Already registered a conflict for primitive ''{0}''.", conflict.getMy().toString())); 
    7979        if (!conflicts.contains(conflict)) { 
    8080            conflicts.add(conflict); 
    … …  
    9292    public void add(Conflict<?> conflict) throws IllegalStateException, IllegalArgumentException { 
    9393        if (conflict == null) 
    94             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "conflict")); 
     94            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "conflict")); 
    9595        addConflict(conflict); 
    9696        fireConflictAdded(); 

  • trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java

    r2095 r2181  
    103103    public BackreferencedDataSet(DataSet source) { 
    104104        if (source == null) 
    105             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null")); 
     105            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.")); 
    106106        this.source = source; 
    107107        int size = source.ways.size() + source.relations.size(); 

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r2165 r2181  
    391391    public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) { 
    392392        if (id <= 0) 
    393             throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id)); 
     393            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id)); 
    394394        if (id <= 0) 
    395             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     395            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    396396        Collection<? extends OsmPrimitive> primitives = null; 
    397397        switch(type) { 

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r2120 r2181  
    176176    public OsmPrimitive(long id) throws IllegalArgumentException { 
    177177        if (id < 0) 
    178             throw new IllegalArgumentException(tr("expected id >= 0. Got {0}", id)); 
     178            throw new IllegalArgumentException(tr("Expected ID >= 0. Got {0}.", id)); 
    179179        this.id = id; 
    180180        this.version = 0; 
    … …  
    300300    public void setVisible(boolean visible) throws IllegalStateException{ 
    301301        if (id == 0 && visible == false) 
    302             throw new IllegalStateException(tr("a primitive with id=0 can't be invisible")); 
     302            throw new IllegalStateException(tr("A primitive with ID = 0 can't be invisible.")); 
    303303        this.visible = visible; 
    304304    } 
    … …  
    336336    public void setOsmId(long id, int version) { 
    337337        if (id <= 0) 
    338             throw new IllegalArgumentException(tr("id > 0 expected. Got {0}", id)); 
     338            throw new IllegalArgumentException(tr("ID > 0 expected. Got {0}.", id)); 
    339339        if (version <= 0) 
    340             throw new IllegalArgumentException(tr("version > 0 expected. Got {0}", version)); 
     340            throw new IllegalArgumentException(tr("Version > 0 expected. Got {0}.", version)); 
    341341        this.id = id; 
    342342        this.version = version; 

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

    r2115 r2181  
    2323            if (type.getAPIName().equals(typeName)) return type; 
    2424        } 
    25         throw new IllegalArgumentException(tr("parameter ''{0}'' is not a valid type name, got ''{1}''", "typeName", typeName)); 
     25        throw new IllegalArgumentException(tr("Parameter ''{0}'' is not a valid type name. Got ''{1}''.", "typeName", typeName)); 
    2626    } 
    2727 
    … …  
    3434        if (cls.equals(Way.class)) return WAY; 
    3535        if (cls.equals(Relation.class)) return RELATION; 
    36         throw new IllegalArgumentException(tr("parameter ''{0}'' is not an acceptable class, got ''{1}''", "cls", cls.toString())); 
     36        throw new IllegalArgumentException(tr("Parameter ''{0}'' is not an acceptable class. Got ''{1}''.", "cls", cls.toString())); 
    3737    } 
    3838 

  • trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

    r2070 r2181  
    570570        if (primitive == null) return; 
    571571        if (! isApplicableToPrimitive()) 
    572             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values")); 
     572            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values.")); 
    573573        for (Tag tag: tags) { 
    574574            if (tag.getValue() == null || tag.getValue().equals("")) { 
    … …  
    591591        if (primitives == null) return; 
    592592        if (! isApplicableToPrimitive()) 
    593             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values")); 
     593            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values.")); 
    594594        for (OsmPrimitive primitive: primitives) { 
    595595            applyTo(primitive); 
    … …  
    608608        if (primitive == null) return; 
    609609        if (! isApplicableToPrimitive()) 
    610             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values")); 
     610            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values.")); 
    611611        primitive.removeAll(); 
    612612        for (Tag tag: tags) { 
    … …  
    626626        if (primitives == null) return; 
    627627        if (! isApplicableToPrimitive()) 
    628             throw new IllegalStateException(tr("tag collection can't be applied to a primitive because there are keys with multiple values")); 
     628            throw new IllegalStateException(tr("Tag collection can't be applied to a primitive because there are keys with multiple values.")); 
    629629        for (OsmPrimitive primitive: primitives) { 
    630630            replaceTagsOf(primitive); 

  • trunk/src/org/openstreetmap/josm/data/osm/Way.java

    r2077 r2181  
    210210        if (n==null) return; 
    211211        if (incomplete) 
    212             throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId())); 
     212            throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId())); 
    213213        if (incomplete) return; 
    214214        clearCached(); 
    … …  
    228228        if (n==null) return; 
    229229        if (incomplete) 
    230             throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId())); 
     230            throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId())); 
    231231        clearCached(); 
    232232        nodes.add(offs, n); 

  • trunk/src/org/openstreetmap/josm/data/osm/history/History.java

    r2017 r2181  
    152152                return primitive; 
    153153        } 
    154         throw new NoSuchElementException(tr("There's no primitive with version {0} in this history", version)); 
     154        throw new NoSuchElementException(tr("There's no primitive with version {0} in this history.", version)); 
    155155    } 
    156156 
    … …  
    159159 
    160160        if (versions.isEmpty()) 
    161             throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history", date)); 
     161            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history.", date)); 
    162162        if (get(0).getTimestamp().compareTo(date)> 0) 
    163             throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history", date)); 
     163            throw new NoSuchElementException(tr("There's no version valid at date ''{0}'' in this history.", date)); 
    164164        for (int i = 1; i < versions.size();i++) { 
    165165            if (get(i-1).getTimestamp().compareTo(date) <= 0 
    … …  
    172172    public HistoryOsmPrimitive get(int idx) { 
    173173        if (idx < 0 || idx >= versions.size()) 
    174             throw new IndexOutOfBoundsException(tr("parameter ''{0}'' in range 0..{1} expected, got {2}", "idx", versions.size()-1, idx)); 
     174            throw new IndexOutOfBoundsException(tr("Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''.", "idx", versions.size()-1, idx)); 
    175175        return versions.get(idx); 
    176176    } 
    … …  
    178178    public HistoryOsmPrimitive getEarliest() { 
    179179        if (isEmpty()) 
    180             throw new NoSuchElementException(tr("no earliest version found. History is empty.")); 
     180            throw new NoSuchElementException(tr("No earliest version found. History is empty.")); 
    181181        return sortAscending().versions.get(0); 
    182182    } 
    … …  
    184184    public HistoryOsmPrimitive getLatest() { 
    185185        if (isEmpty()) 
    186             throw new NoSuchElementException(tr("no latest version found. History is empty.")); 
     186            throw new NoSuchElementException(tr("No latest version found. History is empty.")); 
    187187        return sortDescending().versions.get(0); 
    188188    } 

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

    r2017 r2181  
    2929    protected void ensurePositiveLong(long value, String name) { 
    3030        if (value <= 0) 
    31             throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected, got ''{1}''", name, value)); 
     31            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value)); 
    3232    } 
    3333 
    3434    protected void ensureNotNull(Object obj, String name) { 
    3535        if (obj == null) 
    36             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", name)); 
     36            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", name)); 
    3737    } 
    3838 
    … …  
    102102    public int compareTo(HistoryOsmPrimitive o) { 
    103103        if (this.id != o.id) 
    104             throw new ClassCastException(tr("can't compare primitive with id ''{0}'' to primitive with id ''{1}''", o.id, this.id)); 
     104            throw new ClassCastException(tr("Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id)); 
    105105        return new Long(this.version).compareTo(o.version); 
    106106    } 

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

    r1670 r2181  
    8787    public RelationMember getRelationMember(int idx) throws IndexOutOfBoundsException  { 
    8888        if (idx < 0 || idx >= members.size()) 
    89             throw new IndexOutOfBoundsException(tr("parameter {0} not in range 0..{1}, got {2}", "idx", members.size(),idx)); 
     89            throw new IndexOutOfBoundsException(tr("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", members.size(),idx)); 
    9090        return members.get(idx); 
    9191    } 
    … …  
    108108    public void addMember(RelationMember member) throws IllegalArgumentException { 
    109109        if (member == null) 
    110             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "member")); 
     110            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "member")); 
    111111        members.add(member); 
    112112    } 

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

    r1670 r2181  
    4646    public long getNodeId(int idx) throws IndexOutOfBoundsException { 
    4747        if (idx < 0 || idx >= nodeIds.size()) 
    48             throw new IndexOutOfBoundsException(tr("parameter {0} not in range 0..{1}, got {2}", "idx", nodeIds.size(),idx)); 
     48            throw new IndexOutOfBoundsException(tr("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", nodeIds.size(),idx)); 
    4949        return nodeIds.get(idx); 
    5050    } 

  • trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java

    r2017 r2181  
    2929        this.role = (role == null ? "" : role); 
    3030        if (primitiveType == null) 
    31             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitiveType")); 
     31            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitiveType")); 
    3232        this.primitiveType = primitiveType; 
    3333        if (primitiveId <=0) 
    34             throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected, got ''{1}''", "primitiveId", primitiveId)); 
     34            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitiveId", primitiveId)); 
    3535        this.primitiveId = primitiveId; 
    3636    } 

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

    r2025 r2181  
    4242    public MergeSourceBuildingVisitor(DataSet selectionBase) throws IllegalArgumentException { 
    4343        if (selectionBase == null) 
    44             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "selectionBase")); 
     44            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "selectionBase")); 
    4545        this.selectionBase = selectionBase; 
    4646        this.hull = new DataSet(); 

  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r2107 r2181  
    284284        int curLayerPos = layers.indexOf(layer); 
    285285        if (curLayerPos == -1) 
    286             throw new IllegalArgumentException(tr("layer not in list.")); 
     286            throw new IllegalArgumentException(tr("Layer not in list.")); 
    287287        if (pos == curLayerPos) 
    288288            return; // already in place. 
    … …  
    301301        int curLayerPos = layers.indexOf(layer); 
    302302        if (curLayerPos == -1) 
    303             throw new IllegalArgumentException(tr("layer not in list.")); 
     303            throw new IllegalArgumentException(tr("Layer not in list.")); 
    304304        return curLayerPos; 
    305305    } 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java

    r1954 r2181  
    8080    public ListRole getOppositeRole(ListRole role) { 
    8181        if (!isParticipatingIn(role)) 
    82             throw new IllegalStateException(tr("role {0} is not participating in compare pair {1}", role.toString(), this.toString())); 
     82            throw new IllegalStateException(tr("Role {0} is not participating in compare pair {1}.", role.toString(), this.toString())); 
    8383        if (participatingRoles[0].equals(role)) 
    8484            return participatingRoles[1]; 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r2039 r2181  
    323323        ArrayList<T> mergedEntries = getMergedEntries(); 
    324324        if (current < 0 || current >= mergedEntries.size()) 
    325             throw new IllegalArgumentException(tr("parameter current out of range: got {0}", current)); 
     325            throw new IllegalArgumentException(tr("Parameter current out of range. Got {0}.", current)); 
    326326        for (int i=rows.length -1; i>=0; i--) { 
    327327            int row = rows[i]; 
    … …  
    375375 
    376376        if (current < 0 || current >= mergedEntries.size()) 
    377             throw new IllegalArgumentException(tr("parameter current out of range: got {0}", current)); 
     377            throw new IllegalArgumentException(tr("Parameter current out of range. Got {0}.", current)); 
    378378        if (current == mergedEntries.size() -1) { 
    379379            copyToEnd(source, rows); 
    … …  
    589589        public boolean isSamePositionInOppositeList(int row) { 
    590590            if (!isParticipatingInCurrentComparePair()) 
    591                 throw new IllegalStateException(tr("list in role {0} is currently not participating in a compare pair", role.toString())); 
     591                throw new IllegalStateException(tr("List in role {0} is currently not participating in a compare pair.", role.toString())); 
    592592            if (row >= getEntries().size()) return false; 
    593593            if (row >= getOppositeEntries().size()) return false; 
    … …  
    613613        public boolean isIncludedInOppositeList(int row) { 
    614614            if (!isParticipatingInCurrentComparePair()) 
    615                 throw new IllegalStateException(tr("list in role {0} is currently not participating in a compare pair", role.toString())); 
     615                throw new IllegalStateException(tr("List in role {0} is currently not participating in a compare pair.", role.toString())); 
    616616 
    617617            if (row >= getEntries().size()) return false; 
    … …  
    762762            if (index < compareModes.size()) 
    763763                return compareModes.get(index); 
    764             throw new IllegalArgumentException(tr("unexpected value of parameter \"index\". Got {0}", index)); 
     764            throw new IllegalArgumentException(tr("Unexpected value of parameter ''index''. Got {0}.", index)); 
    765765        } 
    766766 
    … …  
    776776            int i = compareModes.indexOf(anItem); 
    777777            if (i < 0) 
    778                 throw new IllegalStateException(tr("item {0} not found in list", anItem)); 
     778                throw new IllegalStateException(tr("Item {0} not found in list.", anItem)); 
    779779            selectedIdx = i; 
    780780            fireModelDataChanged(); 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r2165 r2181  
    436436                putValue(Action.NAME, tr("> bottom")); 
    437437            } 
    438             putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements")); 
     438            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements.")); 
    439439            setEnabled(false); 
    440440        } 
    … …  
    463463                putValue(Action.NAME, "> before"); 
    464464            } 
    465             putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements")); 
     465            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements.")); 
    466466            setEnabled(false); 
    467467        } 
    … …  
    497497                putValue(Action.NAME, "> after"); 
    498498            } 
    499             putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements")); 
     499            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements.")); 
    500500            setEnabled(false); 
    501501        } 
    … …  
    527527                putValue(Action.NAME, "< top"); 
    528528            } 
    529             putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements")); 
     529            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements.")); 
    530530            setEnabled(false); 
    531531        } 
    … …  
    550550                putValue(Action.NAME, "< bottom"); 
    551551            } 
    552             putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements")); 
     552            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements.")); 
    553553            setEnabled(false); 
    554554        } 
    … …  
    572572                putValue(Action.NAME, "< before"); 
    573573            } 
    574             putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements")); 
     574            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements.")); 
    575575            setEnabled(false); 
    576576        } 
    … …  
    632632                putValue(Action.NAME, tr("Up")); 
    633633            } 
    634             putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position")); 
     634            putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position.")); 
    635635            setEnabled(false); 
    636636        } 
    … …  
    664664                putValue(Action.NAME, tr("Down")); 
    665665            } 
    666             putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position")); 
     666            putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position.")); 
    667667            setEnabled(false); 
    668668        } 
    … …  
    696696                putValue(Action.NAME, tr("Remove")); 
    697697            } 
    698             putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements")); 
     698            putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements.")); 
    699699            setEnabled(false); 
    700700        } 
    … …  
    726726        public FreezeAction() { 
    727727            putValue(Action.NAME, tr("Freeze")); 
    728             putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements")); 
     728            putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements.")); 
    729729            putValue(PROP_SELECTED, false); 
    730730            setEnabled(true); 
    … …  
    759759            if (state == ItemEvent.SELECTED) { 
    760760                putValue(Action.NAME, tr("Unfreeze")); 
    761                 putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging")); 
     761                putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging.")); 
    762762                model.setFrozen(true); 
    763763            } else if (state == ItemEvent.DESELECTED) { 
    764764                putValue(Action.NAME, tr("Freeze")); 
    765                 putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements")); 
     765                putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements.")); 
    766766                model.setFrozen(false); 
    767767            } 
    … …  
    786786        if (newValue) { 
    787787            lblFrozenState.setText( 
    788                     tr("<html>Click <strong>{0}</strong> to start merging my and their entries</html>", 
     788                    tr("<html>Click <strong>{0}</strong> to start merging my and their entries.</html>", 
    789789                            freezeAction.getValue(Action.NAME)) 
    790790            ); 
    791791        } else { 
    792792            lblFrozenState.setText( 
    793                     tr("<html>Click <strong>{0}</strong> to finish merging my and their entries</html>", 
     793                    tr("<html>Click <strong>{0}</strong> to finish merging my and their entries.</html>", 
    794794                            freezeAction.getValue(Action.NAME)) 
    795795            ); 
    … …  
    879879        protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) { 
    880880            if (adjustable == null) 
    881                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable")); 
     881                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); 
    882882 
    883883            if (! synchronizedAdjustables.contains(adjustable)) 
    884                 throw new IllegalStateException(tr("adjustable {0} not registered yet. Can't set participation in synchronized adjustment",adjustable)); 
     884                throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable)); 
    885885 
    886886            enabledMap.put(adjustable, isParticipating); 
    … …  
    897897        protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException { 
    898898            if (! synchronizedAdjustables.contains(adjustable)) 
    899                 throw new IllegalStateException(tr("adjustable {0} not registered yet",adjustable)); 
     899                throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable)); 
    900900 
    901901            return enabledMap.get(adjustable); 
    … …  
    920920        protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException { 
    921921            if (adjustable == null) 
    922                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable")); 
     922                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); 
    923923            if (view == null) 
    924                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view")); 
     924                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "view")); 
    925925 
    926926            if (! synchronizedAdjustables.contains(adjustable)) { 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

    r2165 r2181  
    3131    public void populate(Way my, Way their) { 
    3232        if (my == null) 
    33             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my")); 
     33            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 
    3434        if (their == null) 
    35             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their")); 
     35            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 
    3636        getMergedEntries().clear(); 
    3737        getMyEntries().clear(); 
    … …  
    6565    public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) { 
    6666        if (my == null) 
    67             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my")); 
     67            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 
    6868        if (their == null) 
    69             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their")); 
     69            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 
    7070        if (! isFrozen()) 
    71             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command")); 
     71            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command.")); 
    7272        return new WayNodesConflictResolverCommand(my, their, getMergedEntries()); 
    7373    } 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

    r2039 r2181  
    180180            default: 
    181181                // should not happen 
    182                 throw new RuntimeException(tr("unexpected column index. Got {0}", column)); 
     182                throw new RuntimeException(tr("Unexpected column index. Got {0}.", column)); 
    183183        } 
    184184        return this; 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

    r2070 r2181  
    295295    public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{ 
    296296        if (decision == null) 
    297             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision")); 
     297            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision")); 
    298298        this.deletedMergeDecision = decision; 
    299299        setChanged(); 
    … …  
    310310    public void decideVisibleStateConflict(MergeDecisionType decision) throws IllegalArgumentException { 
    311311        if (decision == null) 
    312             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision")); 
     312            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision")); 
    313313        this.visibleMergeDecision = decision; 
    314314        setChanged(); 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

    r2165 r2181  
    7171    public void populate(Relation my, Relation their) { 
    7272        if (my == null) 
    73             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my")); 
     73            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 
    7474        if (their == null) 
    75             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their")); 
     75            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 
    7676 
    7777        getMergedEntries().clear(); 
    … …  
    114114    public RelationMemberConflictResolverCommand buildResolveCommand(Relation my, Relation their) { 
    115115        if (my == null) 
    116             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my")); 
     116            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 
    117117        if (their == null) 
    118             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their")); 
     118            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 
    119119        if (! isFrozen()) 
    120             throw new IllegalArgumentException(tr("merged nodes not frozen yet. Can't build resolution command")); 
     120            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command")); 
    121121        return new RelationMemberConflictResolverCommand(my, their, getMergedEntries()); 
    122122    } 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

    r2165 r2181  
    3131    public TagMergeItem(String key, String myTagValue, String theirTagValue) { 
    3232        if (key == null) { 
    33             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key")); 
     33            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "key")); 
    3434        } 
    3535        this.key  = key; 
    … …  
    5050     */ 
    5151    public TagMergeItem(String key, OsmPrimitive my, OsmPrimitive their) { 
    52         if (key == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "key")); 
    53         if (my == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my")); 
    54         if (their == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their")); 
     52        if (key == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "key")); 
     53        if (my == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my")); 
     54        if (their == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their")); 
    5555        this.key = key; 
    5656        myTagValue = my.get(key); 
    … …  
    6666     */ 
    6767    public void decide(MergeDecisionType decision) throws IllegalArgumentException { 
    68         if (decision == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "decision")); 
     68        if (decision == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision")); 
    6969        this.mergeDecision = decision; 
    7070    } 
    … …  
    9696     */ 
    9797    public void applyToMyPrimitive(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException { 
    98         if (primitive == null) throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive")); 
     98        if (primitive == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive")); 
    9999        if (mergeDecision == MergeDecisionType.UNDECIDED) { 
    100             throw new IllegalStateException(tr("cannot apply undecided tag merge item")); 
     100            throw new IllegalStateException(tr("Cannot apply undecided tag merge item.")); 
    101101        } else if (mergeDecision == MergeDecisionType.KEEP_THEIR) { 
    102102            if (theirTagValue == null) { 

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

    r2017 r2181  
    3737        default: 
    3838            // should not happen, but just in case  
    39             throw new IllegalArgumentException(tr("Parameter 'col' must be 0 or 1. Got {0}", col)); 
     39            throw new IllegalArgumentException(tr("Parameter 'col' must be 0 or 1. Got {0}.", col)); 
    4040        } 
    4141        return this; 

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

    r2141 r2181  
    4949    public MultiValueResolutionDecision(TagCollection tags) throws IllegalArgumentException { 
    5050        if (tags == null) 
    51             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "tags")); 
     51            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "tags")); 
    5252        if (tags.isEmpty()) 
    53             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be empty", "tags")); 
     53            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be empty.", "tags")); 
    5454        if (tags.getKeys().size() != 1) 
    55             throw new IllegalArgumentException(tr("parameter ''{0}'' with tags for exactly one key expected. Got {1}", "tags", tags.getKeys().size())); 
     55            throw new IllegalArgumentException(tr("Parameter ''{0}'' with tags for exactly one key expected. Got {1}.", "tags", tags.getKeys().size())); 
    5656        this.tags = tags; 
    5757        autoDecide(); 
    … …  
    9797    public void keepOne(String value) throws IllegalArgumentException, IllegalStateException { 
    9898        if (value == null) 
    99             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "value")); 
     99            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "value")); 
    100100        if (!tags.getValues().contains(value)) 
    101             throw new IllegalStateException(tr("tag collection doesn't include the selected value ''{0}''", value)); 
     101            throw new IllegalStateException(tr("Tag collection doesn't include the selected value ''{0}''.", value)); 
    102102        this.value = value; 
    103103        this.type = MultiValueDecisionType.KEEP_ONE; 
    … …  
    134134    public String getChosenValue() throws IllegalStateException { 
    135135        switch(type) { 
    136             case UNDECIDED: throw new IllegalStateException(tr("Not decided yet")); 
     136            case UNDECIDED: throw new IllegalStateException(tr("Not decided yet.")); 
    137137            case KEEP_ONE: return value; 
    138138            case KEEP_NONE: return null; 
    … …  
    211211        if (primitive == null) return; 
    212212        if (!isDecided()) 
    213             throw new IllegalStateException(tr("Not decided yet")); 
     213            throw new IllegalStateException(tr("Not decided yet.")); 
    214214        String key = tags.getKeys().iterator().next(); 
    215215        String value = getChosenValue(); 
    … …  
    247247    public Command buildChangeCommand(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException { 
    248248        if (primitive == null) 
    249             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive")); 
     249            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive")); 
    250250        if (!isDecided()) 
    251             throw new IllegalStateException(tr("Not decided yet")); 
     251            throw new IllegalStateException(tr("Not decided yet.")); 
    252252        String key = tags.getKeys().iterator().next(); 
    253253        String value = getChosenValue(); 
    … …  
    266266    public Command buildChangeCommand(Collection<? extends OsmPrimitive> primitives) { 
    267267        if (primitives == null) 
    268             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitives")); 
     268            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitives")); 
    269269        if (!isDecided()) 
    270             throw new IllegalStateException(tr("Not decided yet")); 
     270            throw new IllegalStateException(tr("Not decided yet.")); 
    271271        String key = tags.getKeys().iterator().next(); 
    272272        String value = getChosenValue(); 

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java

    r2070 r2181  
    1919    public RelationMemberConflictDecision(Relation relation, int pos) throws IllegalArgumentException { 
    2020        if (relation == null) 
    21             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "relation")); 
     21            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "relation")); 
    2222        RelationMember member = relation.getMember(pos); 
    2323        if (member == null) 
    24             throw new IndexOutOfBoundsException(tr("pos {0} is out of range. current number of members: {1}", pos, relation.getMembersCount())); 
     24            throw new IndexOutOfBoundsException(tr("Position {0} is out of range. Current number of members is {1}.", pos, relation.getMembersCount())); 
    2525        this.relation = relation; 
    2626        this.pos  = pos; 

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

    r2070 r2181  
    8484    public void populate(TagCollection tags) { 
    8585        if (tags == null) 
    86             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "tags")); 
     86            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "tags")); 
    8787        this.tags = tags; 
    8888        keys = new ArrayList<String>(); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

    r2070 r2181  
    177177    protected void showHistory(History h) throws IllegalArgumentException { 
    178178        if (h == null) 
    179             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "h")); 
     179            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "h")); 
    180180        if (HistoryBrowserDialogManager.getInstance().existsDialog(h.getId())) { 
    181181            HistoryBrowserDialogManager.getInstance().show(h.getId()); 
    … …  
    237237        public History get(int idx) throws IndexOutOfBoundsException { 
    238238            if (idx < 0 || idx >= data.size()) 
    239                 throw new IndexOutOfBoundsException(tr("index out of bounds Got {0}", idx)); 
     239                throw new IndexOutOfBoundsException(tr("Index out of bounds. Got {0}.", idx)); 
    240240            return data.get(idx); 
    241241        } 
    … …  
    340340            //putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); 
    341341            putValue(Action.NAME, tr("Show")); 
    342             putValue(Action.SHORT_DESCRIPTION, tr("Display the history of the selected primitive")); 
     342            putValue(Action.SHORT_DESCRIPTION, tr("Display the history of the selected primitive.")); 
    343343        } 
    344344 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r2159 r2181  
    279279            this(); 
    280280            if (layer == null) 
    281                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     281                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    282282            this.layer = layer; 
    283283            putValue(NAME, tr("Delete")); 
    … …  
    360360            this(); 
    361361            if (layer == null) 
    362                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     362                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    363363            this.layer = layer; 
    364364            putValue(NAME, tr("Show/Hide")); 
    … …  
    407407            this(); 
    408408            if (layer == null) 
    409                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     409                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    410410            this.layer = layer; 
    411411            putValue(NAME, tr("Activate")); 
    … …  
    462462            this(); 
    463463            if (layer == null) 
    464                 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     464                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    465465            this.layer = layer; 
    466466            putValue(NAME, tr("Merge")); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r2070 r2181  
    119119    public ChildRelationBrowser(OsmDataLayer layer) throws IllegalArgumentException { 
    120120        if (layer == null) 
    121             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     121            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    122122        this.layer = layer; 
    123123        model = new RelationTreeModel(); 
    … …  
    176176    class EditAction extends AbstractAction implements TreeSelectionListener { 
    177177        public EditAction() { 
    178             putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to")); 
     178            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to.")); 
    179179            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); 
    180180            putValue(NAME, tr("Edit")); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

    r2077 r2181  
    7676        super(tr("Download referring relations"), monitor, false /* don't ignore exception */); 
    7777        if (child == null) 
    78             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "child")); 
     78            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "child")); 
    7979        if (layer == null) 
    80             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     80            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    8181        if (child.getId() == 0) 
    82             throw new IllegalArgumentException(tr("child.getId() >0 expected. Got {1}", child.getId())); 
     82            throw new IllegalArgumentException(tr("Value of child.getId() > 0 expected. Got {1}.", child.getId())); 
    8383        referrers = null; 
    8484        this.layer = layer; 
    … …  
    197197        } catch(Exception e) { 
    198198            if (cancelled) { 
    199                 System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e.toString())); 
     199                System.out.println(tr("Warning: Ignoring exception because task is cancelled. Exception: {0}", e.toString())); 
    200200                return; 
    201201            } 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

    r2070 r2181  
    106106        ); 
    107107        if (layer == null) 
    108             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     108            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    109109        this.layer = layer; 
    110110        setRelation(relation); 

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

    r2017 r2181  
    3131    public SelectionTableModel(OsmDataLayer layer) throws IllegalArgumentException { 
    3232        if (layer == null) 
    33             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     33            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    3434        this.layer = layer; 
    3535        cache = new ArrayList<OsmPrimitive>(); 

  • trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java

    r2165 r2181  
    7676    protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) { 
    7777        if (adjustable == null) 
    78             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable")); 
     78            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); 
    7979 
    8080        if (! synchronizedAdjustables.contains(adjustable)) 
    81             throw new IllegalStateException(tr("adjustable {0} not registered yet. Can't set participation in synchronized adjustment",adjustable)); 
     81            throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable)); 
    8282 
    8383        enabledMap.put(adjustable, isParticipating); 
    … …  
    9494    protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException { 
    9595        if (! synchronizedAdjustables.contains(adjustable)) 
    96             throw new IllegalStateException(tr("adjustable {0} not registered yet",adjustable)); 
     96            throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable)); 
    9797 
    9898        return enabledMap.get(adjustable); 
    … …  
    117117    protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException { 
    118118        if (adjustable == null) 
    119             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable")); 
     119            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); 
    120120        if (view == null) 
    121             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view")); 
     121            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "view")); 
    122122 
    123123        if (! synchronizedAdjustables.contains(adjustable)) { 

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r2044 r2181  
    140140    public TagTableModel getTagTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { 
    141141        if (pointInTimeType == null) 
    142             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "pointInTimeType")); 
     142            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType")); 
    143143        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) 
    144144            return currentTagTableModel; 
    … …  
    152152    public NodeListTableModel getNodeListTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { 
    153153        if (pointInTimeType == null) 
    154             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "pointInTimeType")); 
     154            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType")); 
    155155        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) 
    156156            return currentNodeListTableModel; 
    … …  
    164164    public RelationMemberTableModel getRelationMemberTableModel(PointInTimeType pointInTimeType) throws IllegalArgumentException { 
    165165        if (pointInTimeType == null) 
    166             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "pointInTimeType")); 
     166            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType")); 
    167167        if (pointInTimeType.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) 
    168168            return currentRelationMemberTableModel; 
    … …  
    176176    public void setReferencePointInTime(HistoryOsmPrimitive reference) throws IllegalArgumentException, IllegalStateException{ 
    177177        if (reference == null) 
    178             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "reference")); 
     178            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "reference")); 
    179179        if (history == null) 
    180             throw new IllegalStateException(tr("history not initialized yet. Failed to set reference primitive.")); 
     180            throw new IllegalStateException(tr("History not initialized yet. Failed to set reference primitive.")); 
    181181        if (reference.getId() != history.getId()) 
    182             throw new IllegalArgumentException(tr("failed to set reference. reference id {0} doesn't match history id {1}", reference.getId(),  history.getId())); 
     182            throw new IllegalArgumentException(tr("Failed to set reference. Reference ID {0} does not match history ID {1}.", reference.getId(),  history.getId())); 
    183183        HistoryOsmPrimitive primitive = history.getByVersion(reference.getVersion()); 
    184184        if (primitive == null) 
    185             throw new IllegalArgumentException(tr("failed to set reference. reference version {0} not available in history", reference.getVersion())); 
     185            throw new IllegalArgumentException(tr("Failed to set reference. Reference version {0} not available in history.", reference.getVersion())); 
    186186 
    187187        this.reference = reference; 
    … …  
    195195    public void setCurrentPointInTime(HistoryOsmPrimitive current) throws IllegalArgumentException, IllegalStateException{ 
    196196        if (current == null) 
    197             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "current")); 
     197            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "current")); 
    198198        if (history == null) 
    199             throw new IllegalStateException(tr("history not initialized yet. Failed to set current primitive.")); 
     199            throw new IllegalStateException(tr("History not initialized yet. Failed to set current primitive.")); 
    200200        if (current.getId() != history.getId()) 
    201             throw new IllegalArgumentException(tr("failed to set reference. reference id {0} doesn't match history id {1}", current.getId(),  history.getId())); 
     201            throw new IllegalArgumentException(tr("Hailed to set reference. Reference ID {0} does not match history ID {1}.", current.getId(),  history.getId())); 
    202202        HistoryOsmPrimitive primitive = history.getByVersion(current.getVersion()); 
    203203        if (primitive == null) 
    204             throw new IllegalArgumentException(tr("failed to set current. current version {0} not available in history", current.getVersion())); 
     204            throw new IllegalArgumentException(tr("Failed to set current primitive. Current version {0} not available in history.", current.getVersion())); 
    205205        this.current = current; 
    206206        initTagTableModels(); 
    … …  
    238238    public HistoryOsmPrimitive getPointInTime(PointInTimeType type) throws IllegalArgumentException  { 
    239239        if (type == null) 
    240             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     240            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    241241        if (type.equals(PointInTimeType.CURRENT_POINT_IN_TIME)) 
    242242            return current; 

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

    r2070 r2181  
    3838    public HistoryLoadTask add(long id, OsmPrimitiveType type) { 
    3939        if (id <= 0) 
    40             throw new IllegalArgumentException(tr("id > 0 expected, got {0}", id)); 
     40            throw new IllegalArgumentException(tr("ID > 0 expected. Got {0}.", id)); 
    4141        if (type == null) 
    42             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     42            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    4343        if (!toLoad.containsKey(id)) { 
    4444            toLoad.put(id, type); 
    … …  
    4949    public HistoryLoadTask add(HistoryOsmPrimitive primitive) { 
    5050        if (primitive == null) 
    51             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive")); 
     51            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive")); 
    5252        if (!toLoad.containsKey(primitive.getId())) { 
    5353            toLoad.put(primitive.getId(), primitive.getType()); 
    … …  
    5858    public HistoryLoadTask add(History history) { 
    5959        if (history == null) 
    60             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "history")); 
     60            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "history")); 
    6161        if (!toLoad.containsKey(history.getId())) { 
    6262            toLoad.put(history.getId(), history.getEarliest().getType()); 
    … …  
    6767    public HistoryLoadTask add(OsmPrimitive primitive) { 
    6868        if (primitive == null) 
    69             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive")); 
     69            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive")); 
    7070        return add(primitive.getId(), OsmPrimitiveType.from(primitive)); 
    7171    } 
    … …  
    7373    public HistoryLoadTask add(Collection<? extends OsmPrimitive> primitives) { 
    7474        if (primitives == null) 
    75             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitives")); 
     75            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitives")); 
    7676        for (OsmPrimitive primitive: primitives) { 
    7777            if (primitive == null) { 

  • trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    r2096 r2181  
    7474    public VersionInfoPanel(HistoryBrowserModel model, PointInTimeType pointInTimeType) throws IllegalArgumentException { 
    7575        if (pointInTimeType == null) 
    76             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "pointInTimeType")); 
     76            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "pointInTimeType")); 
    7777        if (model == null) 
    78             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "model")); 
     78            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "model")); 
    7979 
    8080        this.model = model; 

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

    r2025 r2181  
    2929    public SaveLayerInfo(OsmDataLayer layer) { 
    3030        if (layer == null) 
    31             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     31            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    3232        this.layer = layer; 
    3333        this.doSaveToFile = layer.requiresSaveToFile(); 

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java

    r2025 r2181  
    3636    protected SaveLayerTask(SaveLayerInfo layerInfo, ProgressMonitor monitor) { 
    3737        if (layerInfo == null) 
    38             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layerInfo")); 
     38            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layerInfo")); 
    3939        if (monitor == null) { 
    4040            monitor = NullProgressMonitor.INSTANCE; 

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r2158 r2181  
    997997        public void addOrUpdate(Changeset cs) { 
    998998            if (cs.getId() <= 0 ) 
    999                 throw new IllegalArgumentException(tr("changeset id > 0 expected. Got {1}", "id", cs.getId())); 
     999                throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", cs.getId())); 
    10001000            internalAddOrUpdate(cs); 
    10011001            fireContentsChanged(this, 0, getSize()); 

  • trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

    r2115 r2181  
    4949    public UploadLayerTask(OsmDataLayer layer, ProgressMonitor monitor, Changeset changeset, boolean closeChangesetAfterUpload) { 
    5050        if (layer == null) 
    51             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", layer)); 
     51            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", layer)); 
    5252        if (monitor == null) { 
    5353            monitor = NullProgressMonitor.INSTANCE; 

  • trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java

    r2025 r2181  
    2525        super(new CancelHandler()); 
    2626        if (delegate == null) 
    27             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "delegate")); 
     27            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "delegate")); 
    2828        this.delegate = delegate; 
    2929    } 

  • trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

    r1879 r2181  
    7272            if (cancel) 
    7373                return null; 
    74             throw new SAXException("Illegal characters within the HTTP-header response", e); 
     74            throw new SAXException("Illegal characters within the HTTP-header response.", e); 
    7575        } catch (IOException e) { 
    7676            if (cancel) 

  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r2115 r2181  
    2323    public ChangesetQuery forUser(long uid) { 
    2424        if (uid <= 0) 
    25             throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected. Got {1}", "uid", uid)); 
     25            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "uid", uid)); 
    2626        this.user = uid; 
    2727        return this; 

  • trunk/src/org/openstreetmap/josm/io/FileExporter.java

    r1949 r2181  
    2222 
    2323    public void exportData(File file, Layer layer) throws IOException { 
    24         throw new IOException(tr("Could not export \"{0}\"", file.getName())); 
     24        throw new IOException(tr("Could not export ''{0}''.", file.getName())); 
    2525    } 
    2626} 

  • trunk/src/org/openstreetmap/josm/io/FileImporter.java

    r2070 r2181  
    2222 
    2323    public void importData(File file) throws IOException, IllegalDataException { 
    24         throw new IOException(tr("Could not read \"{0}\"", file.getName())); 
     24        throw new IOException(tr("Could not read ''{0}''.", file.getName())); 
    2525    } 
    2626 

  • trunk/src/org/openstreetmap/josm/io/GpxExporter.java

    r2163 r2181  
    5353    public void exportData(File file, Layer layer) throws IOException { 
    5454        if (layer == null) 
    55             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 
     55            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer")); 
    5656        if (!(layer instanceof OsmDataLayer) && !(layer instanceof GpxLayer)) 
    57             throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer 
     57            throw new IllegalArgumentException(tr("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer 
    5858                    .getClass().getName())); 
    5959        if (file == null) 
    60             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "file")); 
     60            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "file")); 
    6161 
    6262        String fn = file.getPath(); 
    … …  
    6969        JPanel p = new JPanel(new GridBagLayout()); 
    7070 
    71         p.add(new JLabel(tr("gps track description")), GBC.eol()); 
     71        p.add(new JLabel(tr("GPS track description")), GBC.eol()); 
    7272        JTextArea desc = new JTextArea(3, 40); 
    7373        desc.setWrapStyleWord(true); 

  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r2151 r2181  
    308308        @Override public void endDocument() throws SAXException  { 
    309309            if (!states.empty()) { 
    310                 throw new SAXException(tr("Parse error: invalid document structure for gpx document")); 
     310                throw new SAXException(tr("Parse error: invalid document structure for GPX document.")); 
    311311            } 
    312312            data = currentData; 

  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r2077 r2181  
    112112    protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException, NoSuchElementException{ 
    113113        if (ds == null) 
    114             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "ds")); 
     114            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "ds")); 
    115115        if (id <= 0) return; 
    116116        OsmPrimitive primitive = ds.getPrimitiveById(id, type); 
    117117        if (primitive == null) 
    118             throw new NoSuchElementException(tr("no primitive with id {0} in local dataset. Can't infer primitive type", id)); 
     118            throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id)); 
    119119        remember(id, OsmPrimitiveType.from(primitive)); 
    120120        return; 
    … …  
    414414            } catch(OsmApiException e) { 
    415415                if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) { 
    416                     logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive")); 
     416                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive.")); 
    417417                    singleGetIdPackage(type, pkg, progressMonitor); 
    418418                } else 

  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r2171 r2181  
    8080        String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api"); 
    8181        if (serverUrl == null) 
    82             throw new IllegalStateException(tr("preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url")); 
     82            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can't initialize OsmApi.", "osm-server.url")); 
    8383        return getOsmApi(serverUrl); 
    8484    } 
    … …  
    132132    protected OsmApi(String serverUrl)  { 
    133133        if (serverUrl == null) 
    134             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "serverUrl")); 
     134            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "serverUrl")); 
    135135        this.serverUrl = serverUrl; 
    136136    } 
    … …  
    176176                initialized = false; 
    177177            } 
    178             System.out.println(tr("Communications with {0} established using protocol version {1}", 
     178            System.out.println(tr("Communications with {0} established using protocol version {1}.", 
    179179                    serverUrl, 
    180180                    version)); 
    … …  
    251251            osm.setOsmId(Long.parseLong(ret.trim()), 1); 
    252252        } catch(NumberFormatException e){ 
    253             throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret)); 
     253            throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret)); 
    254254        } 
    255255    } 
    … …  
    277277            } 
    278278        } catch(NumberFormatException e) { 
    279             throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret)); 
     279            throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.", osm.getId(), ret)); 
    280280        } 
    281281    } 
    … …  
    311311    public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException { 
    312312        if (changeset == null) 
    313             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); 
     313            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset")); 
    314314        try { 
    315315            progressMonitor.beginTask((tr("Creating changeset..."))); 
    … …  
    321321                changeset.setOpen(true); 
    322322            } catch(NumberFormatException e){ 
    323                 throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret)); 
     323                throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret)); 
    324324            } 
    325325            progressMonitor.setCustomText((tr("Successfully opened changeset {0}",changeset.getId()))); 
    … …  
    343343    public void updateChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { 
    344344        if (changeset == null) 
    345             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); 
     345            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset")); 
    346346        if (monitor == null) { 
    347347            monitor = NullProgressMonitor.INSTANCE; 
    348348        } 
    349349        if (changeset.getId() <= 0) 
    350             throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId())); 
     350            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId())); 
    351351        try { 
    352352            monitor.beginTask(tr("Updating changeset...")); 
    … …  
    378378    public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException { 
    379379        if (changeset == null) 
    380             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset")); 
     380            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset")); 
    381381        if (monitor == null) { 
    382382            monitor = NullProgressMonitor.INSTANCE; 
    383383        } 
    384384        if (changeset.getId() <= 0) 
    385             throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId())); 
     385            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId())); 
    386386        try { 
    387387            monitor.beginTask(tr("Closing changeset...")); 
    … …  
    405405            progressMonitor.beginTask("", list.size() * 2); 
    406406            if (changeset == null) 
    407                 throw new OsmTransferException(tr("No changeset present for diff upload")); 
     407                throw new OsmTransferException(tr("No changeset present for diff upload.")); 
    408408 
    409409            initialize(progressMonitor); 
    … …  
    596596            throw new OsmTransferException(tr("Current changeset is null. Can't upload data.")); 
    597597        if (changeset.getId() <= 0) 
    598             throw new OsmTransferException(tr("id of current changeset > 0 required. Current id is {0}", changeset.getId())); 
     598            throw new OsmTransferException(tr("ID of current changeset > 0 required. Current ID is {0}.", changeset.getId())); 
    599599    } 
    600600    /** 
    … …  
    622622        } 
    623623        if (changeset.getId() <= 0) 
    624             throw new IllegalArgumentException(tr("Changeset id > 0 expected. Got {0}", changeset.getId())); 
     624            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId())); 
    625625        if (!changeset.isOpen()) 
    626             throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}", changeset.getId())); 
     626            throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}.", changeset.getId())); 
    627627        this.changeset = changeset; 
    628628    } 

  • trunk/src/org/openstreetmap/josm/io/OsmApiException.java

    r1874 r2181  
    9191            sb.append(tr("(Code={0})", responseCode)); 
    9292        } else { 
    93             sb.append(tr("The server replied an error with code {0}", responseCode)); 
     93            sb.append(tr("The server replied an error with code {0}.", responseCode)); 
    9494        } 
    9595        return sb.toString(); 

  • trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

    r2115 r2181  
    7070            String value = atts.getValue("id"); 
    7171            if (value == null) { 
    72                 throwException(tr("missing mandatory attribute ''{0}''", "id")); 
     72                throwException(tr("Missing mandatory attribute ''{0}''.", "id")); 
    7373            } 
    7474            long id = 0; 
    … …  
    7676                id = Long.parseLong(value); 
    7777            } catch(NumberFormatException e) { 
    78                 throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "id", value)); 
     78                throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "id", value)); 
    7979            } 
    8080            if (id <= 0) { 
    81                 throwException(tr("illegal nummeric value for attribute ''{0}''. Got ''{1}''", "id", id)); 
     81                throwException(tr("Illegal nummeric value for attribute ''{0}''. Got ''{1}''.", "id", id)); 
    8282            } 
    8383            current.setId(id); 
    … …  
    107107            value = atts.getValue("open"); 
    108108            if (value == null) { 
    109                 throwException(tr("missing mandatory attribute ''{0}''", "open")); 
     109                throwException(tr("Missing mandatory attribute ''{0}''.", "open")); 
    110110            } else if (value.equals("true")) { 
    111111                current.setOpen(true); 
    … …  
    113113                current.setOpen(false); 
    114114            } else { 
    115                 throwException(tr("illegal boolean value for attribute ''{0}''. Got ''{1}''", "open", value)); 
     115                throwException(tr("Illegal boolean value for attribute ''{0}''. Got ''{1}''.", "open", value)); 
    116116            } 
    117117 
    … …  
    126126                    minLon = Double.parseDouble(min_lon); 
    127127                } catch(NumberFormatException e) { 
    128                     throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lon", min_lon)); 
     128                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", min_lon)); 
    129129                } 
    130130                double minLat = 0; 
    … …  
    132132                    minLat = Double.parseDouble(min_lat); 
    133133                } catch(NumberFormatException e) { 
    134                     throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lat", min_lat)); 
     134                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", min_lat)); 
    135135                } 
    136136                current.setMin(new LatLon(minLat, minLon)); 
    … …  
    142142                    maxLon = Double.parseDouble(max_lon); 
    143143                } catch(NumberFormatException e) { 
    144                     throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lon", max_lon)); 
     144                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", max_lon)); 
    145145                } 
    146146                double maxLat = 0; 
    … …  
    148148                    maxLat = Double.parseDouble(max_lat); 
    149149                } catch(NumberFormatException e) { 
    150                     throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lat", max_lat)); 
     150                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", max_lat)); 
    151151                } 
    152152                current.setMax(new LatLon(maxLon, maxLat)); 
    … …  
    157157            if (qName.equals("osm")) { 
    158158                if (atts == null) { 
    159                     throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}", "version", "osm")); 
     159                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm")); 
    160160                } 
    161161                String v = atts.getValue("version"); 
    162162                if (v == null) { 
    163                     throwException(tr("Missing mandatory attribute ''{0}''", "version")); 
     163                    throwException(tr("Missing mandatory attribute ''{0}''.", "version")); 
    164164                } 
    165165                if (!(v.equals("0.6"))) { 
    … …  
    195195                return User.createOsmUser(id, name); 
    196196            } catch(NumberFormatException e) { 
    197                 throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''", uid)); 
     197                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid)); 
    198198            } 
    199199            return null; 

  • trunk/src/org/openstreetmap/josm/io/OsmExporter.java

    r2025 r2181  
    8181            JOptionPane.showMessageDialog( 
    8282                    Main.parent, 
    83                     tr("<html>An error occurred while saving.<br>Error is: <br>{0}</html>", e.getMessage()), 
     83                    tr("<html>An error occurred while saving.<br>Error is:<br>{0}</html>", e.getMessage()), 
    8484                    tr("Error"), 
    8585                    JOptionPane.ERROR_MESSAGE 
    … …  
    9696                JOptionPane.showMessageDialog( 
    9797                        Main.parent, 
    98                         tr("<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</html>", e2.getMessage()), 
     98                        tr("<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</html>", e2.getMessage()), 
    9999                        tr("Error"), 
    100100                        JOptionPane.ERROR_MESSAGE 

  • trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

    r1811 r2181  
    6666            String v = attr.getValue(name); 
    6767            if (v == null) { 
    68                 throwException(tr("mandatory attribute ''{0}'' missing", name)); 
     68                throwException(tr("Missing mandatory attribute ''{0}''.", name)); 
    6969            } 
    7070            Long l = 0l; 
    … …  
    7272                l = Long.parseLong(v); 
    7373            } catch(NumberFormatException e) { 
    74                 throwException(tr("illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''", name, v)); 
     74                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v)); 
    7575            } 
    7676            if (l < 0) { 
    77                 throwException(tr("illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''", name, v)); 
     77                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v)); 
    7878            } 
    7979            return l; 
    … …  
    8383            String v = attr.getValue(name); 
    8484            if (v == null) { 
    85                 throwException(tr("mandatory attribute ''{0}'' missing", name)); 
     85                throwException(tr("Missing mandatory attribute ''{0}''.", name)); 
    8686            } 
    8787            Integer i = 0; 
    … …  
    8989                i = Integer.parseInt(v); 
    9090            } catch(NumberFormatException e) { 
    91                 throwException(tr("illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''", name, v)); 
     91                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''.", name, v)); 
    9292            } 
    9393            if (i < 0) { 
    94                 throwException(tr("illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''", name, v)); 
     94                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''.", name, v)); 
    9595            } 
    9696            return i; 
    … …  
    100100            String v = attr.getValue(name); 
    101101            if (v == null) { 
    102                 throwException(tr("mandatory attribute ''{0}'' missing", name)); 
     102                throwException(tr("Missing mandatory attribute ''{0}''.", name)); 
    103103            } 
    104104            return v; 
    … …  
    108108            String v = attr.getValue(name); 
    109109            if (v == null) { 
    110                 throwException(tr("mandatory attribute ''{0}'' missing", name)); 
     110                throwException(tr("Missing mandatory attribute ''{0}''.", name)); 
    111111            } 
    112112            if (v.equals("true")) return true; 
    113113            if (v.equals("false")) return false; 
    114             throwException(tr("illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''", name, v)); 
     114            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v)); 
    115115            // not reached 
    116116            return false; 
    … …  
    172172                type = OsmPrimitiveType.fromApiTypeName(v); 
    173173            } catch(IllegalArgumentException e) { 
    174                 throwException(tr("illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got ''{1}''", "type", v)); 
     174                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v)); 
    175175            } 
    176176            String role = getMandatoryAttributeString(atts, "role"); 

  • trunk/src/org/openstreetmap/josm/io/OsmImporter.java

    r2070 r2181  
    3434        } catch (FileNotFoundException e) { 
    3535            e.printStackTrace(); 
    36             throw new IOException(tr("File \"{0}\" does not exist", file.getName())); 
     36            throw new IOException(tr("File ''{0}'' does not exist.", file.getName())); 
    3737        } 
    3838    } 

  • trunk/src/org/openstreetmap/josm/io/OsmReader.java

    r2155 r2181  
    172172            if (qName.equals("osm")) { 
    173173                if (atts == null) { 
    174                     throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}", "version", "osm")); 
     174                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm")); 
    175175                } 
    176176                String v = atts.getValue("version"); 
    177177                if (v == null) { 
    178                     throwException(tr("Missing mandatory attribute ''{0}''", "version")); 
     178                    throwException(tr("Missing mandatory attribute ''{0}''.", "version")); 
    179179                } 
    180180                if (!(v.equals("0.5") || v.equals("0.6"))) { 
    … …  
    203203                } else { 
    204204                    throwException(tr( 
    205                             "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''", 
     205                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.", 
    206206                            minlon, minlat, maxlon, maxlat, origin 
    207207                    )); 
    … …  
    226226                if (list == null) { 
    227227                    throwException( 
    228                             tr("found XML element <nd> element not as direct child of element <way>") 
     228                            tr("Found XML element <nd> not as direct child of element <way>.") 
    229229                    ); 
    230230                } 
    231231                if (atts.getValue("ref") == null) { 
    232232                    throwException( 
    233                             tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}", "ref", current.id) 
     233                            tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}.", "ref", current.id) 
    234234                    ); 
    235235                } 
    … …  
    237237                if (id == 0) { 
    238238                    throwException( 
    239                             tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}", id) 
     239                            tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}.", id) 
    240240                    ); 
    241241                } 
    … …  
    254254                if (list == null) { 
    255255                    throwException( 
    256                             tr("Found XML element <member> not as direct child of element <relation>") 
     256                            tr("Found XML element <member> not as direct child of element <relation>.") 
    257257                    ); 
    258258                } 
    … …  
    260260                String value = atts.getValue("ref"); 
    261261                if (value == null) { 
    262                     throwException(tr("Missing attribute ''ref'' on member in relation {0}",current.id)); 
     262                    throwException(tr("Missing attribute ''ref'' on member in relation {0}.",current.id)); 
    263263                } 
    264264                try { 
    … …  
    269269                value = atts.getValue("type"); 
    270270                if (value == null) { 
    271                     throwException(tr("Missing attribute ''type'' on member {0} in relation {1}", Long.toString(emd.id), Long.toString(current.id))); 
     271                    throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(emd.id), Long.toString(current.id))); 
    272272                } 
    273273                if (! (value.equals("way") || value.equals("node") || value.equals("relation"))) { 
    … …  
    309309                return User.createOsmUser(id, name); 
    310310            } catch(NumberFormatException e) { 
    311                 throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''", uid)); 
     311                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid)); 
    312312            } 
    313313            return null; 
    … …  
    319319            current.id = getLong(atts, "id"); 
    320320            if (current.id == 0) { 
    321                 throwException(tr("Illegal object with id=0")); 
     321                throwException(tr("Illegal object with ID=0.")); 
    322322            } 
    323323 
    … …  
    345345                    current.version = Integer.parseInt(version); 
    346346                } catch(NumberFormatException e) { 
    347                     throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version)); 
     347                    throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version)); 
    348348                } 
    349349                if (ds.version.equals("0.6")){ 
    350350                    if (current.version <= 0 && current.id > 0) { 
    351                         throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version)); 
     351                        throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version)); 
    352352                    } else if (current.version < 0 && current.id  <=0) { 
    353                         System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.6''. Got {1}", current.id, current.version)); 
     353                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.6")); 
    354354                        current.version = 0; 
    355355                    } 
    356356                } else if (ds.version.equals("0.5")) { 
    357357                    if (current.version <= 0 && current.id > 0) { 
    358                         System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 1, API version is ''0.5''. Got {1}", current.id, current.version)); 
     358                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5")); 
    359359                        current.version = 1; 
    360360                    } else if (current.version < 0 && current.id  <=0) { 
    361                         System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.5''. Got {1}", current.id, current.version)); 
     361                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.5")); 
    362362                        current.version = 0; 
    363363                    } 
    364364                } else { 
    365365                    // should not happen. API version has been checked before 
    366                     throwException(tr("Unknown or unsupported API version. Got {0}", ds.version)); 
     366                    throwException(tr("Unknown or unsupported API version. Got {0}.", ds.version)); 
    367367                } 
    368368            } else { 
    … …  
    370370                // 
    371371                if (current.id > 0 && ds.version != null && ds.version.equals("0.6")) { 
    372                     throwException(tr("Missing attribute ''version'' on OSM primitive with id {0}", Long.toString(current.id))); 
     372                    throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.id))); 
    373373                } 
    374374            } 
    … …  
    392392                return Long.parseLong(value); 
    393393            } catch(NumberFormatException e) { 
    394                 throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''",name, value)); 
     394                throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''.",name, value)); 
    395395            } 
    396396            return 0; // should not happen 
    … …  
    416416                        throw new IllegalDataException ( 
    417417                                tr( 
    418                                         "way with external id ''{0}'' includes missing node with external id ''{1}''", 
     418                                        "Way with external ID ''{0}'' includes missing node with external ID ''{1}''.", 
    419419                                        externalWayId, 
    420420                                        id 
    … …  
    429429            w.setNodes(wayNodes); 
    430430            if (incomplete) { 
    431                 logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the " + 
    432                         "loaded data and is therefore incomplete too", externalWayId, w.getNodesCount())); 
     431                logger.warning(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " + 
     432                        "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount())); 
    433433                w.incomplete = true; 
    434434                ds.addPrimitive(w); 
    … …  
    477477                } else 
    478478                    throw new IllegalDataException( 
    479                             tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''", rm.type,externalRelationId) 
     479                            tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''.", rm.type,externalRelationId) 
    480480                    ); 
    481481 
    … …  
    488488                        throw new IllegalDataException( 
    489489                                tr( 
    490                                         "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''", 
     490                                        "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''.", 
    491491                                        externalRelationId, 
    492492                                        rm.id 

  • trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

    r2070 r2181  
    5050    public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException { 
    5151        if (primitive == null) 
    52             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive")); 
     52            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive")); 
    5353        if (primitive.getId() == 0) 
    54             throw new IllegalArgumentException(tr("id parameter ''{0}'' > 0 required. Got {1}", "primitive", primitive.getId())); 
     54            throw new IllegalArgumentException(tr("ID parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitive", primitive.getId())); 
    5555        this.id = primitive.getId(); 
    5656        this.primitiveType = OsmPrimitiveType.from(primitive); 
    … …  
    7070    public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) throws IllegalArgumentException   { 
    7171        if (id <= 0) 
    72             throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 required. Got {1}", "id", id)); 
     72            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id)); 
    7373        if (type == null) 
    74             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     74            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    7575        this.id = id; 
    7676        this.primitiveType = type; 

  • trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

    r2124 r2181  
    4444    public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException { 
    4545        if (query == null) 
    46             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "query")); 
     46            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "query")); 
    4747        if (monitor == null) { 
    4848            monitor = NullProgressMonitor.INSTANCE; 
    … …  
    7878    public Changeset readChangeset(long id, ProgressMonitor monitor) throws OsmTransferException { 
    7979        if (id <= 0) 
    80             throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected. Got {1}", "id", id)); 
     80            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id)); 
    8181        if (monitor == null) { 
    8282            monitor = NullProgressMonitor.INSTANCE; 

  • trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java

    r1892 r2181  
    3131    public OsmServerHistoryReader(OsmPrimitiveType type, long id) throws IllegalArgumentException { 
    3232        if (type == null) 
    33             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     33            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    3434        if (id < 0) 
    35             throw new IllegalArgumentException(tr("parameter ''{0}'' >= 0 expected, got ''{1}''", "id", id)); 
     35            throw new IllegalArgumentException(tr("Parameter ''{0}'' >= 0 expected. Got ''{1}''.", "id", id)); 
    3636        this.primitiveType = type; 
    3737        this.id = id; 

  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r2124 r2181  
    6161                activeConnection = (HttpURLConnection)url.openConnection(); 
    6262            } catch(Exception e) { 
    63                 throw new OsmTransferException(tr("Failed to open connection to API {0}", url.toExternalForm()), e); 
     63                throw new OsmTransferException(tr("Failed to open connection to API {0}.", url.toExternalForm()), e); 
    6464            } 
    6565            if (cancel) { 
    … …  
    8686                activeConnection.connect(); 
    8787            } catch (Exception e) { 
    88                 throw new OsmTransferException(tr("Couldn't connect to the osm server. Please check your internet connection."), e); 
     88                throw new OsmTransferException(tr("Couldn't connect to the OSM server. Please check your internet connection."), e); 
    8989            } 
    9090            try { 

  • trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java

    r2124 r2181  
    4646            Node xmlNode = (Node)xpath.compile("/osm/user[1]").evaluate(document, XPathConstants.NODE); 
    4747            if ( xmlNode== null) 
    48                 throw new OsmDataParsingException(tr("XML tag <user> is missing")); 
     48                throw new OsmDataParsingException(tr("XML tag <user> is missing.")); 
    4949 
    5050            // -- id 
    5151            String v = getAttribute(xmlNode, "id"); 
    5252            if (v == null) 
    53                 throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "id", "user")); 
     53                throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "id", "user")); 
    5454            try { 
    5555                userInfo.setId(Long.parseLong(v)); 
    5656            } catch(NumberFormatException e) { 
    57                 throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "id", "user", v)); 
     57                throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "id", "user", v)); 
    5858            } 
    5959            // -- display name 
    … …  
    7575                v = getAttribute(xmlNode, "lat"); 
    7676                if (v == null) 
    77                     throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "lat", "home")); 
     77                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "lat", "home")); 
    7878                double lat; 
    7979                try { 
    8080                    lat = Double.parseDouble(v); 
    8181                } catch(NumberFormatException e) { 
    82                     throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "lat", "home", v)); 
     82                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "lat", "home", v)); 
    8383                } 
    8484 
    8585                v = getAttribute(xmlNode, "lon"); 
    8686                if (v == null) 
    87                     throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "lon", "home")); 
     87                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "lon", "home")); 
    8888                double lon; 
    8989                try { 
    9090                    lon = Double.parseDouble(v); 
    9191                } catch(NumberFormatException e) { 
    92                     throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "lon", "home", v)); 
     92                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "lon", "home", v)); 
    9393                } 
    9494 
    9595                v = getAttribute(xmlNode, "zoom"); 
    9696                if (v == null) 
    97                     throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "zoom", "home")); 
     97                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "zoom", "home")); 
    9898                int zoom; 
    9999                try { 
    100100                    zoom = Integer.parseInt(v); 
    101101                } catch(NumberFormatException e) { 
    102                     throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "zoom", "home", v)); 
     102                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "zoom", "home", v)); 
    103103                } 
    104104                userInfo.setHome(new LatLon(lat,lon)); 

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r2115 r2181  
    145145            boolean useDiffUpload = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0); 
    146146            if (useDiffUpload && ! casUseDiffUploads) { 
    147                 System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion)); 
     147                System.out.println(tr("WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion)); 
    148148                useDiffUpload = false; 
    149149            } 

  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r2017 r2181  
    341341    public static ImageIcon get(OsmPrimitiveType type) throws IllegalArgumentException { 
    342342        if (type == null) 
    343             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type")); 
     343            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type")); 
    344344        return get("data", type.getAPIName()); 
    345345    } 

  • trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

    r2070 r2181  
    102102            Matcher m = p.matcher(preferenceValue); 
    103103            if (!m.find()) 
    104                 throw new WindowGeometryException(tr("preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window geometry from preferences.", preferenceKey, field)); 
     104                throw new WindowGeometryException(tr("Preference with key ''{0}'' does not include ''{1}''. Can''t restore window geometry from preferences.", preferenceKey, field)); 
    105105            v = m.group(1); 
    106106            return Integer.parseInt(v); 
    … …  
    108108            throw e; 
    109109        } catch(NumberFormatException e) { 
    110             throw new WindowGeometryException(tr("preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got {2}. Can''t restore window geometry from preferences.", preferenceKey, field, v)); 
     110            throw new WindowGeometryException(tr("Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. Can''t restore window geometry from preferences.", preferenceKey, field, v)); 
    111111        } catch(Exception e) { 
    112             throw new WindowGeometryException(tr("failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Can''t restore window geometry from preferences.", preferenceKey, field, e.toString()), e); 
     112            throw new WindowGeometryException(tr("Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Can''t restore window geometry from preferences.", preferenceKey, field, e.toString()), e); 
    113113        } 
    114114    } 
    … …  
    117117        String value = Main.pref.get(preferenceKey); 
    118118        if (value == null) 
    119             throw new WindowGeometryException(tr("preference with key ''{0}'' doesn''t exist. Can''t restore window geometry from preferences.", preferenceKey)); 
     119            throw new WindowGeometryException(tr("Preference with key ''{0}'' does not exist. Can''t restore window geometry from preferences.", preferenceKey)); 
    120120        topLeft = new Point(); 
    121121        extent = new Dimension(); 
    … …  
    156156            initFromPreferences(preferenceKey); 
    157157        } catch(WindowGeometryException e) { 
    158             System.out.println(tr("Warning: failed to restore window geometry from key ''{0}''. Falling back to default geometry. Details: {1}", preferenceKey, e.getMessage())); 
     158            System.out.println(tr("Warning: Failed to restore window geometry from key ''{0}''. Falling back to default geometry. Details: {1}", preferenceKey, e.getMessage())); 
    159159            initFromWindowGeometry(defaultGeometry); 
    160160        } 
Note: See TracChangeset for help on using the changeset viewer.