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/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java +++ b/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java @@ -74,6 +74,7 @@ protected JPanel buildUploadCommentPanel() { JPanel pnl = new JPanel(new GridBagLayout()); + pnl.setBorder(BorderFactory.createTitledBorder(tr("Tags of changeset {0}", ""))); JEditorPane commentLabel = new JMultilineLabel("" + tr("Provide a brief comment for the changes you are uploading:")); pnl.add(commentLabel, GBC.eol().insets(0, 5, 10, 3).fill(GBC.HORIZONTAL)); 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/src/org/openstreetmap/josm/gui/io/UploadDialog.java +++ b/src/org/openstreetmap/josm/gui/io/UploadDialog.java @@ -116,7 +116,7 @@ public UploadDialog() { * @return the unique instance of the upload dialog */ public static synchronized UploadDialog getUploadDialog() { - if (uploadDialog == null) { + if (1==1||uploadDialog == null) { uploadDialog = new UploadDialog(); } return uploadDialog; 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/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java +++ b/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java @@ -162,15 +162,17 @@ public void setCloseChangesetAfterNextUpload(boolean value) { } protected void updateSummary() { - jepMessage.setText("" - + buildStrategySummary() - + "
" - + Optional.of(OsmApi.getOsmApi().getServerUrl()) + final String server = Optional.of(OsmApi.getOsmApi().getServerUrl()) .filter(url -> !Config.getUrls().getDefaultOsmApiUrl().equals(url)) .map(url -> tr("… to server: {0}", url)) - .orElse("") - + "

" + .orElse(""); + jepMessage.setText("" + + "
" + buildChangesetSummary() + + "

" + + buildStrategySummary() + + "
" + + server + ""); }