Ticket #18619: 18619.patch

File 18619.patch, 2.5 KB (added by simon04, 6 years ago)

  • src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java 

    diff --git a/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
index b15518546..30ae2ebf4 100644
    a b  
    7474
    7575    protected JPanel buildUploadCommentPanel() {
    7676        JPanel pnl = new JPanel(new GridBagLayout());
     77        pnl.setBorder(BorderFactory.createTitledBorder(tr("Tags of changeset {0}", "")));
    7778
    7879        JEditorPane commentLabel = new JMultilineLabel("<html><b>" + tr("Provide a brief comment for the changes you are uploading:"));
    7980        pnl.add(commentLabel, GBC.eol().insets(0, 5, 10, 3).fill(GBC.HORIZONTAL));

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

    diff --git a/src/org/openstreetmap/josm/gui/io/UploadDialog.java b/src/org/openstreetmap/josm/gui/io/UploadDialog.java
index f77c5cd2b..224902ba6 100644
    a b public UploadDialog() {  
    116116     * @return the unique instance of the upload dialog
    117117     */
    118118    public static synchronized UploadDialog getUploadDialog() {
    119         if (uploadDialog == null) {
     119        if (1==1||uploadDialog == null) {
    120120            uploadDialog = new UploadDialog();
    121121        }
    122122        return uploadDialog;

  • src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java 

    diff --git a/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
index fad13e0ff..e1b0d93b8 100644
    a b public void setCloseChangesetAfterNextUpload(boolean value) {  
    162162    }
    163163
    164164    protected void updateSummary() {
    165         jepMessage.setText("<html>"
    166                 + buildStrategySummary()
    167                 + "<br>"
    168                 + Optional.of(OsmApi.getOsmApi().getServerUrl())
     165        final String server = Optional.of(OsmApi.getOsmApi().getServerUrl())
    169166                .filter(url -> !Config.getUrls().getDefaultOsmApiUrl().equals(url))
    170167                .map(url -> tr("… to server: <strong>{0}</strong>", url))
    171                 .orElse("")
    172                 + "<br><br>"
     168                .orElse("");
     169        jepMessage.setText("<html>"
     170                + "<br>"
    173171                + buildChangesetSummary()
     172                + "<br><br>"
     173                + buildStrategySummary()
     174                + "<br>"
     175                + server
    174176                + "</html>");
    175177    }
    176178