Ignore:
Timestamp:
2010-01-13T20:12:10+01:00 (16 years ago)
Author:
mjulius
Message:

fix messages for gui/conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2612 r2846  
    44import static org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType.UNDECIDED;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.beans.PropertyChangeListener;
    … …  
    3132import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
    3233import org.openstreetmap.josm.io.OsmTransferException;
     34import org.openstreetmap.josm.tools.CheckParameterUtil;
    3335
    3436/**
    … …  
    292294     */
    293295    public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{
    294         if (decision == null)
    295             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision"));
     296        CheckParameterUtil.ensureParameterNotNull(decision, "decision");
    296297        this.deletedMergeDecision = decision;
    297298        setChanged();
    … …  
    307308     */
    308309    public void decideVisibleStateConflict(MergeDecisionType decision) throws IllegalArgumentException {
    309         if (decision == null)
    310             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "decision"));
     310        CheckParameterUtil.ensureParameterNotNull(decision, "decision");
    311311        this.visibleMergeDecision = decision;
    312312        setChanged();
    … …  
    468468        int ret = JOptionPane.showOptionDialog(
    469469                Main.parent,
    470                 tr("<html>There are {0} additional nodes used by way {1}<br>"
    471                         + "which are deleted on the server.<br>"
    472                         + "<br>"
    473                         + "Do you want to undelete these nodes too?</html>",
    474                         Long.toString(dependent.size()), Long.toString(way.getId())),
    475                         tr("Undelete additional nodes?"),
    476                         JOptionPane.YES_NO_OPTION,
    477                         JOptionPane.QUESTION_MESSAGE,
    478                         null,
    479                         options,
    480                         options[0]
     470                "<html>" + trn("There is {0} additional node used by way {1}<br>"
     471                        + "which is deleted on the server."
     472                        + "<br><br>"
     473                        + "Do you want to undelete this node too?",
     474                        "There are {0} additional nodes used by way {1}<br>"
     475                        + "which are deleted on the server."
     476                        + "<br><br>"
     477                        + "Do you want to undelete these nodes too?",
     478                        dependent.size(), dependent.size(), way.getId())
     479                        + "</html>",
     480                tr("Undelete additional nodes?"),
     481                JOptionPane.YES_NO_OPTION,
     482                JOptionPane.QUESTION_MESSAGE,
     483                null,
     484                options,
     485                options[0]
    481486        );
    482487
    … …  
    497502        int ret = JOptionPane.showOptionDialog(
    498503                Main.parent,
    499                 tr("<html>There are {0} additional primitives referred to by relation {1}<br>"
    500                         + "which are deleted on the server.<br>"
    501                         + "<br>"
    502                         + "Do you want to undelete them too?</html>",
    503                         Long.toString(dependent.size()), Long.toString(r.getId())),
    504                         tr("Undelete dependent primitives?"),
    505                         JOptionPane.YES_NO_OPTION,
    506                         JOptionPane.QUESTION_MESSAGE,
    507                         null,
    508                         options,
    509                         options[0]
     504                "<html>" + trn("There is {0} additional primitive referred to by relation {1}<br>"
     505                        + "which is deleted on the server."
     506                        + "<br><br>"
     507                        + "Do you want to undelete this too?",
     508                        "There are {0} additional primitives referred to by relation {1}<br>"
     509                        + "which are deleted on the server."
     510                        + "<br><br>"
     511                        + "Do you want to undelete these too?",
     512                        dependent.size(), dependent.size(), r.getId())
     513                        + "</html>",
     514                tr("Undelete dependent primitives?"),
     515                JOptionPane.YES_NO_OPTION,
     516                JOptionPane.QUESTION_MESSAGE,
     517                null,
     518                options,
     519                options[0]
    510520        );
    511521
Note: See TracChangeset for help on using the changeset viewer.