Changeset 29353 in osm for applications

Timestamp:

2013-03-08T23:43:49+01:00 (11 years ago)

Author:

donvip

Message:

[josm_reverter] fix #josm8494 - automatically paste changeset id from buffer + history

Location:

applications/editors/josm/plugins/reverter

Files:

• build.xml (modified) (1 diff)
• src/reverter/ChangesetIdQuery.java (modified) (6 diffs)
• src/reverter/RevertChangesetAction.java (modified) (1 diff)

applications/editors/josm/plugins/reverter/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5680"/>
+    <property name="plugin.main.version" value="5765"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.text.NumberFormat;
-import java.text.ParseException;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
-import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.plaf.basic.BasicComboBoxEditor;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.widgets.ChangesetIdTextField;
+import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -29 +34 @@
 @SuppressWarnings("serial")
 public class ChangesetIdQuery extends ExtendedDialog {
-    private final NumberFormat format = NumberFormat.getIntegerInstance();
-    private final JFormattedTextField tcid = new JFormattedTextField(format);
+    private final JPanel panel = new JPanel(new GridBagLayout());
+    private final ChangesetIdTextField tcid = new ChangesetIdTextField();
+    private final HistoryComboBox cbId = new HistoryComboBox();
     private final ButtonGroup bgRevertType = new ButtonGroup();
     private final JRadioButton rbFull = new JRadioButton(tr("Revert changeset fully"));
@@ -37 +43 @@
     private final JCheckBox cbNewLayer = new JCheckBox(tr("Download as new layer"));
     
-    private final Color defaultForegroundColor = tcid.getForeground();
-
     public int getChangesetId() {
-        try {
-            return format.parse(tcid.getText()).intValue();
-        } catch (ParseException e) {
-            return 0;
-        }
+        return tcid.getChangesetId();
     }
     
@@ -66 +66 @@
         super(Main.parent, tr("Revert changeset"), new String[] {tr("Revert"),tr("Cancel")}, true);
         contentInsets = new Insets(10,10,10,5);
-        setButtonIcons(new String[] {"ok.png", "cancel.png" });
-        JPanel panel = new JPanel(new GridBagLayout());
+        
         panel.add(new JLabel(tr("Changeset id:")));
-        panel.add(tcid, GBC.eol().fill(GBC.HORIZONTAL));
+
+        cbId.setEditor(new BasicComboBoxEditor() {
+            @Override
+            protected JTextField createEditorComponent() {
+                return tcid;
+            }
+        });
+        cbId.setToolTipText(tr("Enter the ID of the changeset that should be reverted"));
+        restoreChangesetsHistory(cbId);
+
+        // forward the enter key stroke to the revert button
+        tcid.getKeymap().removeKeyStrokeBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false));
+        
+        panel.add(cbId, GBC.eol().fill(GBC.HORIZONTAL));
 
         bgRevertType.add(rbFull);
@@ -83 +95 @@
                 +"Unselect to download into the currently active data layer.</html>"));
         panel.add(cbNewLayer, GBC.eol().fill(GBC.HORIZONTAL));
+    }
+
+    @Override
+    public void setupDialog() {
+        setContent(panel, false);
+        setButtonIcons(new String[] {"ok.png", "cancel.png" });
+        setDefaultButton(1);
+        
+        addWindowListener(new InternalWindowListener());
+        super.setupDialog();
         
         final DataSet ds = Main.main.getCurrentDataSet();
@@ -104 +126 @@
             private void idChanged() {
                 if (tcid.hasFocus()) {
-                    boolean idOK = getChangesetId() > 0;
-                    tcid.setForeground(idOK ? defaultForegroundColor : Color.RED);
-                    buttons.get(0).setEnabled(idOK);
+                    buttons.get(0).setEnabled(tcid.readIds());
                 }
             }
         });
         
-        setContent(panel);
-        setupDialog();
+        if (Main.pref.getBoolean("downloadchangeset.autopaste", true)) { 
+            tcid.tryToPasteFromClipboard();
+        }
         
-        // Initially disables the Revert button
-        buttons.get(0).setEnabled(false);
-                
-        // When pressing Enter in the changeset id field, validate the dialog if the id is correct (i.e. Revert button enabled)
-        tcid.addKeyListener(new KeyListener() {
-            @Override public void keyPressed(KeyEvent e) {}
-            @Override public void keyTyped(KeyEvent e) { }
-            @Override public void keyReleased(KeyEvent e) {
-                if (e != null && e.getKeyCode() == KeyEvent.VK_ENTER && buttons.get(0).isEnabled()) {
-                    buttons.get(0).doClick();
+        // Initially sets the revert button consistent with text id field contents
+        buttons.get(0).setEnabled(tcid.readIds());
+    }
+
+    /**
+     * Restore the current history from the preferences
+     *
+     * @param cbHistory
+     */
+    protected void restoreChangesetsHistory(HistoryComboBox cbHistory) {
+        List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(getClass().getName() + ".changesetsHistory", new LinkedList<String>()));
+        // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
+        Collections.reverse(cmtHistory);
+        cbHistory.setPossibleItems(cmtHistory);
+    }
+    
+    /**
+     * Remind the current history in the preferences
+     * @param cbHistory
+     */
+    protected void remindChangesetsHistory(HistoryComboBox cbHistory) {
+        cbHistory.addCurrentItemToHistory();
+        Main.pref.putCollection(getClass().getName() + ".changesetsHistory", cbHistory.getHistory());
+    }
+    
+    private class InternalWindowListener implements WindowListener {
+        @Override public void windowClosed(WindowEvent e) {
+            if (e != null && e.getComponent() == ChangesetIdQuery.this && getValue() == 1) {
+                if (!tcid.readIds()) {
+                    return;
                 }
+                remindChangesetsHistory(cbId);
             }
-        });
+        }
+    
+        @Override public void windowOpened(WindowEvent e) {}
+        @Override public void windowClosing(WindowEvent e) {}
+        @Override public void windowIconified(WindowEvent e) {}
+        @Override public void windowDeiconified(WindowEvent e) {}
+        @Override public void windowActivated(WindowEvent e) {}
+        @Override public void windowDeactivated(WindowEvent e) {}
     }
 }

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

@@ -25 +25 @@
     public void actionPerformed(ActionEvent arg0)  {
         final ChangesetIdQuery dlg = new ChangesetIdQuery();
-        dlg.setVisible(true);
-        if (dlg.getValue() != 1) return;
+        if (dlg.showDialog().getValue() != 1) return;
         final int changesetId = dlg.getChangesetId();
         final RevertType revertType = dlg.getRevertType();