Changeset 2915 in josm for trunk


Ignore:
Timestamp:
2010-01-31T18:15:15+01:00 (10 years ago)
Author:
stoecker
Message:

close #4458 - text fixes - patch by Andre

Location:
trunk
Files:
19 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r2711 r2915  
    277277
    278278    /**
    279      * Utility class to sort a collection of of new relations with their dependencies
     279     * Utility class to sort a collection of new relations with their dependencies
    280280     * topologically.
    281281     *
  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r2845 r2915  
    8383     * Adds a conflict to the collection of conflicts.
    8484     *
    85      * @param conflict the conflict to to add. Must not be null.
     85     * @param conflict the conflict to add. Must not be null.
    8686     * @throws IllegalArgumentException thrown, if conflict is null
    8787     * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy()
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r2869 r2915  
    8181    private SelectObjectsAction selectObjectsAction;
    8282    private  ReadChangesetsAction readChangesetAction;
    83     private ShowChangesetInfoAction showChangsetInfoAction;
     83    private ShowChangesetInfoAction showChangesetInfoAction;
    8484    private CloseOpenChangesetsAction closeChangesetAction;
    8585    private LaunchChangesetManagerAction launchChangesetManagerAction;
     
    202202
    203203        // -- show info action
    204         showChangsetInfoAction = new ShowChangesetInfoAction();
    205         tp.add(new SideButton(showChangsetInfoAction, false));
    206         cbInSelectionOnly.addItemListener(showChangsetInfoAction);
    207         lstInActiveDataLayer.getSelectionModel().addListSelectionListener(showChangsetInfoAction);
    208         lstInSelection.getSelectionModel().addListSelectionListener(showChangsetInfoAction);
     204        showChangesetInfoAction = new ShowChangesetInfoAction();
     205        tp.add(new SideButton(showChangesetInfoAction, false));
     206        cbInSelectionOnly.addItemListener(showChangesetInfoAction);
     207        lstInActiveDataLayer.getSelectionModel().addListSelectionListener(showChangesetInfoAction);
     208        lstInSelection.getSelectionModel().addListSelectionListener(showChangesetInfoAction);
    209209
    210210        // -- launch changeset manager action
     
    574574            add(closeChangesetAction);
    575575            addSeparator();
    576             add(showChangsetInfoAction);
     576            add(showChangesetInfoAction);
    577577        }
    578578    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

    r2895 r2915  
    217217                                + "Conflict resolutions will not be applied unless all differences<br>"
    218218                                + "are resolved.<br>"
    219                                 + "Click <strong>{0}</strong> to close anyway.<strong>Already<br>"
     219                                + "Click <strong>{0}</strong> to close anyway.<strong> Already<br>"
    220220                                + "resolved differences will not be applied.</strong><br>"
    221221                                + "Click <strong>{1}</strong> to return to resolving conflicts.</html>"
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java

    r2847 r2915  
    116116     * id <code>changesetId</code>.
    117117     *
    118      * @param changsetId the changeset id
     118     * @param changesetId the changeset id
    119119     * @return true if the local {@see ChangesetCache} already includes the changeset with
    120120     * id <code>changesetId</code>
    121121     */
    122     protected boolean isAvailableLocally(int changsetId) {
    123         return ChangesetCache.getInstance().get(changsetId) != null;
     122    protected boolean isAvailableLocally(int changesetId) {
     123        return ChangesetCache.getInstance().get(changesetId) != null;
    124124    }
    125125
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java

    r2847 r2915  
    3030public class SingleChangesetDownloadPanel extends JPanel {
    3131
    32     private JTextField tfChangsetId;
     32    private JTextField tfChangesetId;
    3333    private DownloadAction actDownload;
    3434    private ChangesetIdValidator valChangesetId;
     
    4444
    4545        add(new JLabel(tr("Changeset ID: ")));
    46         add(tfChangsetId = new JTextField(10));
    47         tfChangsetId.setToolTipText(tr("Enter a changset id"));
    48         valChangesetId  =ChangesetIdValidator.decorate(tfChangsetId);
    49         SelectAllOnFocusGainedDecorator.decorate(tfChangsetId);
     46        add(tfChangesetId = new JTextField(10));
     47        tfChangesetId.setToolTipText(tr("Enter a changeset id"));
     48        valChangesetId  =ChangesetIdValidator.decorate(tfChangesetId);
     49        SelectAllOnFocusGainedDecorator.decorate(tfChangesetId);
    5050
    5151        actDownload = new DownloadAction();
    5252        SideButton btn = new SideButton(actDownload);
    53         tfChangsetId.addActionListener(actDownload);
    54         tfChangsetId.getDocument().addDocumentListener(actDownload);
     53        tfChangesetId.addActionListener(actDownload);
     54        tfChangesetId.getDocument().addDocumentListener(actDownload);
    5555        add(btn);
    5656    }
     
    6666     * @return the changeset id entered in this panel
    6767     */
    68     public int getChangsetId() {
     68    public int getChangesetId() {
    6969        return valChangesetId.getChangesetId();
    7070    }
     
    8484            if (!isEnabled())
    8585                return;
    86             int id = getChangsetId();
     86            int id = getChangesetId();
    8787            if (id == 0) return;
    8888            ChangesetContentDownloadTask task =  new ChangesetContentDownloadTask(
     
    9494
    9595        protected void updateEnabledState() {
    96             String v = tfChangsetId.getText();
     96            String v = tfChangesetId.getText();
    9797            if (v == null || v.trim().length() == 0) {
    9898                setEnabled(false);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java

    r2801 r2915  
    107107        gc.weightx = 1.0;
    108108        pnl.add(cbMyChangesetsOnly = new JCheckBox(tr("Download my changesets only")), gc);
    109         cbMyChangesetsOnly.setToolTipText(tr("<html>Select to restrict the query to your changsets only.<br>Unselect to include all changesets in the query.</html>"));
     109        cbMyChangesetsOnly.setToolTipText(tr("<html>Select to restrict the query to your changesets only.<br>Unselect to include all changesets in the query.</html>"));
    110110
    111111        // grab remaining space
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java

    r2801 r2915  
    3838    /** true if the task was canceled */
    3939    private boolean canceled;
    40     /** the set of downloaded changsets */
     40    /** the set of downloaded changesets */
    4141    private Set<Changeset> downloadedChangesets;
    4242    /** the last exception remembered, if any */
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r2847 r2915  
    10801080                            tr("No, continue editing"),
    10811081                            ImageProvider.get("cancel"),
    1082                             tr("Click to to return to the relation editor and to resume relation editing") ,
     1082                            tr("Click to return to the relation editor and to resume relation editing") ,
    10831083                            null /* no specific help topic */
    10841084                    )
  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

    r2850 r2915  
    226226                + "<p class=\"warning-body\">Help content for the help topic <strong>{0}</strong> is "
    227227                + "not available yet. It is missing both in your local language ({1}) and in english.<br><br>"
    228                 + "Please help to improve the JOSM help system and fill in the missing information."
     228                + "Please help to improve the JOSM help system and fill in the missing information. "
    229229                + "You can both edit the <a href=\"{2}\">help topic in your local language ({1})</a> and "
    230230                + "the <a href=\"{3}\">help topic in english</a>."
     
    348348                        tr(
    349349                                "<html>Failed to open help page for url {0}.<br>"
    350                                 + "This is most likely due to a network problem, please check your<br>"
     350                                + "This is most likely due to a network problem, please check<br>"
    351351                                + "your internet connection</html>",
    352352                                url.toString()
  • trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

    r2848 r2915  
    191191     *
    192192     */
    193     protected void handleUploadConflictForClosedChangeset(long changsetId, Date d) {
     193    protected void handleUploadConflictForClosedChangeset(long changesetId, Date d) {
    194194        String msg =  tr("<html>Uploading <strong>failed</strong> because you have been using<br>"
    195195                + "changeset {0} which was already closed at {1}.<br>"
    196196                + "Please upload again with a new or an existing open changeset.</html>",
    197                 changsetId, new SimpleDateFormat().format(d)
     197                changesetId, new SimpleDateFormat().format(d)
    198198        );
    199199        JOptionPane.showMessageDialog(
  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r2848 r2915  
    236236            super.build();
    237237            tfUserName.setToolTipText(tr("Please enter the user name of your OSM account"));
    238             tfPassword.setToolTipText(tr("Please enter the password name of your OSM account"));
     238            tfPassword.setToolTipText(tr("Please enter the password of your OSM account"));
    239239            lblHeading.setText(
    240240                    "<html>" + tr("Authenticating at the OSM API ''{0}'' failed. Please enter a valid username and a valid password.",
  • trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java

    r2848 r2915  
    119119                im.setPartiallyIdentified(im.getUserName());
    120120            }
    121             System.err.println(tr("Warning: Failed to retrieve user infos for the current JOSM user. Exceptions was: {0}", e.toString()));
     121            System.err.println(tr("Warning: Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString()));
    122122        }
    123123    }
  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r2835 r2915  
    3939    private ConfigurationParameterRequestHandler configHandler;
    4040
    41     protected String buildChangsetSummary() {
     41    protected String buildChangesetSummary() {
    4242        StringBuffer msg = new StringBuffer();
    4343        if (selectedChangeset == null || selectedChangeset.isNew()) {
     
    6767        //
    6868        boolean useOneChangeset = true;
    69         int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
     69        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
    7070        if (maxChunkSize > 0 && numObjects > maxChunkSize) {
    7171            useOneChangeset = false;
     
    174174        sb.append(buildStrategySummary());
    175175        sb.append("<br><br>");
    176         sb.append(buildChangsetSummary());
     176        sb.append(buildChangesetSummary());
    177177        sb.append("</html>");
    178178        jepMessage.setText(sb.toString());
  • trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

    r2862 r2915  
    9797        };
    9898        int numObjectsToUploadLeft = toUpload.getSize() - processedPrimitives.size();
    99         String msg1 = tr("The server reported that the current changset was closed.<br>"
     99        String msg1 = tr("The server reported that the current changeset was closed.<br>"
    100100                + "This is most likely because the changesets size exceeded the max. size<br>"
    101101                + "of {0} objects on the server ''{1}''.",
    102                 OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize(),
     102                OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize(),
    103103                OsmApi.getOsmApi().getBaseUrl()
    104104        );
     
    110110        );
    111111        String msg3 = tr(
    112                 "Click ''<strong>{0}</strong>'' to continue uploading to additional new changsets.<br>"
     112                "Click ''<strong>{0}</strong>'' to continue uploading to additional new changesets.<br>"
    113113                + "Click ''<strong>{1}</strong>'' to return to the upload dialog.<br>"
    114114                + "Click ''<strong>{2}</strong>'' to abort uploading and return to map editing.<br>",
     
    126126                specs,
    127127                specs[0],
    128                 ht("/Action/UploadAction#ChangsetFull")
     128                ht("/Action/UploadAction#ChangesetFull")
    129129        );
    130130        switch(ret) {
     
    138138    }
    139139
    140     protected void openNewChangset() {
     140    protected void openNewChangeset() {
    141141        // make sure the current changeset is removed from the upload dialog.
    142142        //
     
    147147    }
    148148
    149     protected boolean recoverFromChangsetFullException() {
     149    protected boolean recoverFromChangesetFullException() {
    150150        if (toUpload.getSize() - processedPrimitives.size() == 0) {
    151151            strategy.setPolicy(MaxChangesetSizeExceededPolicy.ABORT);
     
    168168            // prepare the state of the task for a next iteration in uploading.
    169169            //
    170             openNewChangset();
     170            openNewChangeset();
    171171            toUpload.removeProcessed(processedPrimitives);
    172172            return true;
     
    264264                        // Most likely the changeset is full. Try to recover and continue
    265265                        // with a new changeset, but let the user decide first (see
    266                         // recoverFromChangsetFullException)
     266                        // recoverFromChangesetFullException)
    267267                        //
    268                         if (recoverFromChangsetFullException()) {
     268                        if (recoverFromChangesetFullException()) {
    269269                            continue;
    270270                        }
  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r2848 r2915  
    221221        add(new JPanel(), gc);
    222222
    223         int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
     223        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
    224224        pnlMultiChangesetPolicyPanel.setVisible(
    225225                maxChunkSize > 0 && numUploadedObjects > maxChunkSize
     
    316316
    317317    protected void updateNumRequestsLabels() {
    318         int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
     318        int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
    319319        if (maxChunkSize > 0 && numUploadedObjects > maxChunkSize) {
    320320            rbStrategy.get(UploadStrategy.SINGLE_REQUEST_STRATEGY).setEnabled(false);
     
    407407            try {
    408408                int chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
    409                 int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangsetSize();
     409                int maxChunkSize = OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize();
    410410                if (chunkSize <= 0) {
    411411                    setErrorFeedback(tfChunkSize, tr("Illegal chunk size <= 0. Please enter an integer > 1"));
  • trunk/src/org/openstreetmap/josm/io/Capabilities.java

    r2875 r2915  
    8080     * @return the max number of objects in a changeset
    8181     */
    82     public int getMaxChangsetSize() {
     82    public int getMaxChangesetSize() {
    8383        String v = get("changesets", "maximum_elements");
    8484        if (v == null) return -1;
  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r2875 r2915  
    156156
    157157    /**
    158      * appends a {@see Way}s id and the list of ids of nodes the way refers to to the list of ids which will be fetched from the server.
     158     * appends a {@see Way}s id and the list of ids of nodes the way refers to the list of ids which will be fetched from the server.
    159159     *
    160160     * @param way the way (ignored, if null)
  • trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

    r2852 r2915  
    164164     * Downloads the content of a changeset
    165165     *
    166      * @param id the changset id. >0 required.
     166     * @param id the changeset id. >0 required.
    167167     * @param monitor the progress monitor. {@see NullProgressMonitor#INSTANCE} assumed if null.
    168      * @return the changset content
     168     * @return the changeset content
    169169     * @throws IllegalArgumentException thrown if id <= 0
    170170     * @throws OsmTransferException thrown if something went wrong
  • trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy

    r2912 r2915  
    1414import static org.junit.Assert.*;
    1515
    16 class ChangsetQueryUrlParserTest {
     16class ChangesetQueryUrlParserTest {
    1717        final shouldFail = new GroovyTestCase().&shouldFail
    1818       
Note: See TracChangeset for help on using the changeset viewer.