Ignore:
Timestamp:
2009-09-22T15:34:19+02:00 (10 years ago)
Author:
stoecker
Message:

lots of i18n fixes

Location:
trunk/src/org/openstreetmap/josm/gui/history
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 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;
Note: See TracChangeset for help on using the changeset viewer.