Changeset 16092 in josm for trunk/src


Ignore:
Timestamp:
2020-03-08T20:44:42+01:00 (5 years ago)
Author:
simon04
Message:

fix #18619 - Upload dialog: add border, reorder summary

Location:
trunk/src/org/openstreetmap/josm/gui/io
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r15802 r16092  
    7676    protected JPanel buildUploadCommentPanel() {
    7777        JPanel pnl = new JPanel(new GridBagLayout());
     78        pnl.setBorder(BorderFactory.createTitledBorder(tr("Tags of changeset {0}", "")));
    7879
    7980        JEditorPane commentLabel = new JMultilineLabel("<html><b>" + tr("Provide a brief comment for the changes you are uploading:"));

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

    r14729 r16092  
    163163
    164164    protected void updateSummary() {
     165        final String server = Optional.of(OsmApi.getOsmApi().getServerUrl())
     166                .filter(url -> !Config.getUrls().getDefaultOsmApiUrl().equals(url))
     167                .map(url -> tr("… to server: <strong>{0}</strong>", url))
     168                .orElse("");
    165169        jepMessage.setText("<html>"
     170                + "<br>"
     171                + buildChangesetSummary()
     172                + "<br><br>"
    166173                + buildStrategySummary()
    167174                + "<br>"
    168                 + Optional.of(OsmApi.getOsmApi().getServerUrl())
    169                 .filter(url -> !Config.getUrls().getDefaultOsmApiUrl().equals(url))
    170                 .map(url -> tr("… to server: <strong>{0}</strong>", url))
    171                 .orElse("")
    172                 + "<br><br>"
    173                 + buildChangesetSummary()
     175                + server
    174176                + "</html>");
    175177    }
Note: See TracChangeset for help on using the changeset viewer.