Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2037) @@ -4,4 +4,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.GridBagConstraints; @@ -44,4 +46,5 @@ import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.WindowGeometry; import org.xml.sax.SAXException; @@ -438,82 +441,40 @@ class UploadConfirmationHook implements UploadHook { - private JCheckBox cbUseAtomicUpload; - - protected JPanel buildChangesetControlPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); - pnl.add(cbUseAtomicUpload = new JCheckBox(tr("upload all changes in one request"))); - cbUseAtomicUpload.setToolTipText(tr("Enable to upload all changes in one request, disable to use one request per changed primitive")); - boolean useAtomicUpload = Main.pref.getBoolean("osm-server.atomic-upload", true); - cbUseAtomicUpload.setSelected(useAtomicUpload); - cbUseAtomicUpload.setEnabled(OsmApi.getOsmApi().hasChangesetSupport()); - return pnl; - } public boolean checkUpload(Collection add, Collection update, Collection delete) { - - JPanel p = new JPanel(new GridBagLayout()); - - OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); - - if (!add.isEmpty()) { - p.add(new JLabel(tr("Objects to add:")), GBC.eol()); - JList l = new JList(add.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } - - if (!update.isEmpty()) { - p.add(new JLabel(tr("Objects to modify:")), GBC.eol()); - JList l = new JList(update.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } - - if (!delete.isEmpty()) { - p.add(new JLabel(tr("Objects to delete:")), GBC.eol()); - JList l = new JList(delete.toArray()); - l.setCellRenderer(renderer); - l.setVisibleRowCount(l.getModel().getSize() < 6 ? l.getModel().getSize() : 10); - p.add(new JScrollPane(l), GBC.eol().fill()); - } - - p.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3)); - SuggestingJHistoryComboBox cmt = new SuggestingJHistoryComboBox(); - List cmtHistory = new LinkedList(Main.pref.getCollection(HISTORY_KEY, new LinkedList())); - cmt.setHistory(cmtHistory); - p.add(cmt, GBC.eol().fill(GBC.HORIZONTAL)); - //final JTextField cmt = new JTextField(lastCommitComment); - - // configuration options for atomic upload - p.add(buildChangesetControlPanel(), GBC.eol().fill(GridBagConstraints.HORIZONTAL)); - + final UploadDialogPanel panel = new UploadDialogPanel(add, update, delete); + + ExtendedDialog dialog = new ExtendedDialog( + Main.parent, + tr("Upload these changes?"), + new String[] {tr("Upload Changes"), tr("Cancel")} + ) { + @Override + public void setVisible(boolean visible) { + if (visible) { + new WindowGeometry( + panel.getClass().getName(), + WindowGeometry.centerInWindow(JOptionPane.getFrameForComponent(Main.parent), new Dimension(400,400)) + ).apply(this); + panel.startUserInput(); + } else { + new WindowGeometry(this).remember(panel.getClass().getName()); + } + super.setVisible(visible); + } + }; + + dialog.setButtonIcons(new String[] {"upload.png", "cancel.png"}); + dialog.setContent(panel, false /* no scroll pane */); while(true) { - ExtendedDialog dialog = new ExtendedDialog( - Main.parent, - tr("Upload these changes?"), - new String[] {tr("Upload Changes"), tr("Cancel")} - ); - dialog.setButtonIcons(new String[] {"upload.png", "cancel.png"}); - dialog.setContent(p, false /* no scroll pane */); dialog.showDialog(); int result = dialog.getValue(); - - // cancel pressed if (result != 1) return false; - // don't allow empty commit message - if (cmt.getText().trim().length() < 3) { + if (! panel.hasChangesetComment()) { continue; } - - // store the history of comments - cmt.addCurrentItemToHistory(); - Main.pref.putCollection(HISTORY_KEY, cmt.getHistory()); - Main.pref.put("osm-server.atomic-upload", cbUseAtomicUpload.isSelected()); - + panel.rememberUserInput(); break; } @@ -573,5 +534,5 @@ uploadCancelled = true; if (writer != null) { - writer.disconnectActiveConnection(); + writer.cancel(); } } @@ -589,3 +550,142 @@ } } + + /** + * The panel displaying information about primitives to upload and providing + * UI widgets for entering the changeset comment and other configuration + * setttings. + * + */ + static private class UploadDialogPanel extends JPanel { + + private JList lstAdd; + private JList lstUpdate; + private JList lstDelete; + private JCheckBox cbUseAtomicUpload; + private SuggestingJHistoryComboBox cmt; + + protected int getNumLists() { + int ret = 0; + if (lstAdd.getModel().getSize() > 0) { + ret++; + } + if (lstUpdate.getModel().getSize() > 0) { + ret++; + } + if (lstDelete.getModel().getSize() > 0) { + ret++; + } + return ret; + } + + protected JPanel buildListsPanel() { + JPanel pnl = new JPanel(); + pnl.setLayout(new GridBagLayout()); + + GridBagConstraints gcLabel = new GridBagConstraints(); + gcLabel.fill = GridBagConstraints.HORIZONTAL; + gcLabel.weightx = 1.0; + gcLabel.weighty = 0.0; + gcLabel.anchor = GridBagConstraints.FIRST_LINE_START; + + GridBagConstraints gcList = new GridBagConstraints(); + gcList.fill = GridBagConstraints.BOTH; + gcList.weightx = 1.0; + gcList.weighty = 1.0 / getNumLists(); + gcList.anchor = GridBagConstraints.CENTER; + + int y = -1; + + if (lstAdd.getModel().getSize() >0) { + y++; + gcLabel.gridy = y; + pnl.add(new JLabel(tr("Objects to add:")), gcLabel); + y++; + gcList.gridy = y; + pnl.add(new JScrollPane(lstAdd), gcList); + } + if (lstUpdate.getModel().getSize() >0) { + y++; + gcLabel.gridy = y; + pnl.add(new JLabel(tr("Objects to modify:")), gcLabel); + y++; + gcList.gridy = y; + pnl.add(new JScrollPane(lstUpdate), gcList); + } + if (lstDelete.getModel().getSize() >0) { + y++; + gcLabel.gridy = y; + pnl.add(new JLabel(tr("Objects to delete:")), gcLabel); + y++; + gcList.gridy = y; + pnl.add(new JScrollPane(lstDelete), gcList); + } + return pnl; + } + + protected JPanel buildChangesetControlPanel() { + JPanel pnl = new JPanel(); + pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); + pnl.add(cbUseAtomicUpload = new JCheckBox(tr("upload all changes in one request"))); + cbUseAtomicUpload.setToolTipText(tr("Enable to upload all changes in one request, disable to use one request per changed primitive")); + boolean useAtomicUpload = Main.pref.getBoolean("osm-server.atomic-upload", true); + cbUseAtomicUpload.setSelected(useAtomicUpload); + cbUseAtomicUpload.setEnabled(OsmApi.getOsmApi().hasChangesetSupport()); + return pnl; + } + + protected JPanel buildUploadControlPanel() { + JPanel pnl = new JPanel(); + pnl.setLayout(new GridBagLayout()); + pnl.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3)); + cmt = new SuggestingJHistoryComboBox(); + List cmtHistory = new LinkedList(Main.pref.getCollection(HISTORY_KEY, new LinkedList())); + cmt.setHistory(cmtHistory); + pnl.add(cmt, GBC.eol().fill(GBC.HORIZONTAL)); + + // configuration options for atomic upload + // + pnl.add(buildChangesetControlPanel(), GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + return pnl; + } + + protected void build() { + setLayout(new BorderLayout()); + add(buildListsPanel(), BorderLayout.CENTER); + add(buildUploadControlPanel(), BorderLayout.SOUTH); + } + + public UploadDialogPanel(Collection add, Collection update, Collection delete) { + OsmPrimitivRenderer renderer = new OsmPrimitivRenderer(); + + lstAdd = new JList(add.toArray()); + lstAdd.setCellRenderer(renderer); + lstAdd.setVisibleRowCount(Math.min(lstAdd.getModel().getSize(), 10)); + + lstUpdate = new JList(update.toArray()); + lstUpdate.setCellRenderer(renderer); + lstUpdate.setVisibleRowCount(Math.min(lstUpdate.getModel().getSize(), 10)); + + lstDelete = new JList(update.toArray()); + lstDelete.setCellRenderer(renderer); + lstDelete.setVisibleRowCount(Math.min(lstDelete.getModel().getSize(), 10)); + build(); + } + + public boolean hasChangesetComment() { + return cmt.getText().trim().length() >= 3; + } + + public void rememberUserInput() { + // store the history of comments + cmt.addCurrentItemToHistory(); + Main.pref.putCollection(HISTORY_KEY, cmt.getHistory()); + Main.pref.put("osm-server.atomic-upload", cbUseAtomicUpload.isSelected()); + } + + public void startUserInput() { + cmt.getEditor().selectAll(); + cmt.requestFocus(); + } + } } Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 2037) @@ -48,5 +48,5 @@ // For easy access when inherited - protected Object contentConstraints = GBC.eol().anchor(GBC.CENTER).fill(GBC.HORIZONTAL).insets(5,10,5,0); + protected Object contentConstraints = GBC.eol().anchor(GBC.CENTER).fill(GBC.BOTH).insets(5,10,5,0); protected ArrayList buttons = new ArrayList(); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 2037) @@ -83,5 +83,5 @@ setCancelled(true); if (writer != null) { - writer.disconnectActiveConnection(); + writer.cancel(); } } Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 2037) @@ -160,4 +160,5 @@ if (initialized) return; + cancel = false; initAuthentication(); try { Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 2037) @@ -23,4 +23,5 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.tools.Base64; import org.openstreetmap.josm.tools.GBC; @@ -94,6 +95,4 @@ public void cancel() { - //TODO - //Main.pleaseWaitDlg.currentAction.setText(tr("Aborting...")); cancel = true; if (activeConnection != null) { @@ -112,6 +111,6 @@ try { synchronized (credentialsManager) { - auth = credentialsManager.lookup(CredentialsManager.Key.USERNAME) + ":" + - credentialsManager.lookup(CredentialsManager.Key.PASSWORD); + auth = credentialsManager.lookup(CredentialsManager.Key.USERNAME) + ":" + + credentialsManager.lookup(CredentialsManager.Key.PASSWORD); } } catch (CredentialsManager.CMException e) { @@ -139,5 +138,5 @@ String secret = Main.pref.get("osm-server." + key.toString(), null); if (secret == null) throw new CredentialsManager.NoContentException(); - return secret; + return secret; } public void store(CredentialsManager.Key key, String secret) { @@ -171,16 +170,18 @@ p.add(warning, GBC.eop()); - JCheckBox savePassword = new JCheckBox(tr("Save user and password (unencrypted)"), - !username.equals("") && !password.equals("")); + JCheckBox savePassword = new JCheckBox(tr("Save user and password (unencrypted)"), + !username.equals("") && !password.equals("")); p.add(savePassword, GBC.eop()); - int choice = new ExtendedDialog( - Main.parent, - tr("Enter Password"), - p, - new String[] {tr("Login"), tr("Cancel")}, - new String[] {"ok.png", "cancel.png"}).getValue(); - - if (choice != 1) { + ExtendedDialog dialog = new ExtendedDialog( + Main.parent, + tr("Enter Password"), + new String[] {tr("Login"), tr("Cancel")} + ); + dialog.setContent(p); + dialog.setButtonIcons( new String[] {"ok.png", "cancel.png"}); + dialog.showDialog(); + + if (dialog.getValue() != 1) { caller.authCancelled = true; return null; @@ -223,5 +224,7 @@ oldServerURL = ""; } - if (oldServerURL.equals("")) oldServerURL = "http://api.openstreetmap.org/api"; + if (oldServerURL.equals("")) { + oldServerURL = "http://api.openstreetmap.org/api"; + } try { oldUsername = lookup(Key.USERNAME); @@ -258,5 +261,5 @@ String newPassword = String.valueOf(osmDataPassword.getPassword()); if (!oldServerURL.equals(newServerURL)) { - store(Key.OSM_SERVER_URL, newServerURL); + store(Key.OSM_SERVER_URL, newServerURL); } if (!oldUsername.equals(newUsername)) { Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 2036) +++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 2037) @@ -12,5 +12,4 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.UploadAction; -import org.openstreetmap.josm.data.osm.Changeset; import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; @@ -203,7 +202,7 @@ } - public void disconnectActiveConnection() { - if (api != null && api.activeConnection != null) { - api.activeConnection.disconnect(); + public void cancel() { + if (api != null) { + api.cancel(); } }