Changeset 61a149d

Timestamp:

Jul 15, 2010, 5:52:25 PM (9 years ago)

Author:

Michael Seifert <mseifert@…>

Branches:

master

Children:

f851f4a

Parents:

f6a2d3c

Message:

The user has to confirm the removal of replays from the replay table;

Fixed a bug that caused an error, when removing a node from the IndexHierarchy?

Location:

src/main/java/de/erichseifert/warp

Files:

• gui/ReplayParserGUI.java (modified) (2 diffs)
• io/search/IndexHierarchy.java (modified) (2 diffs)

src/main/java/de/erichseifert/warp/gui/ReplayParserGUI.java

@@ -46 +46 @@
 import javax.swing.Action;
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JFileChooser;
@@ -222 +223 @@
                         @Override
                         public void actionPerformed(ActionEvent e) {
-                                // TODO open confirm dialog
-                                int row = replayTable.getSelectedRow();
-                                ReplayDescriptor descriptor = (ReplayDescriptor) replayTable.getValueAt(row, 0);
-                                ReplayParserGUI.this.warp.remove(descriptor.getId());
+                                JCheckBox removeReplayFromFS = new JCheckBox("Also remove the replay from the file system (cannot be undone)");
+                                JCheckBox rememberDecision = new JCheckBox("Remember my decision");
+                                rememberDecision.setEnabled(false);
+                                // Open confirm dialog
+                                Object[] message = new Object[3];
+                                message[0] = "Do you really want to remove this replay?";
+                                message[1] = removeReplayFromFS;
+                                message[2] = rememberDecision;
+                                int userOption = JOptionPane.showConfirmDialog(
+                                        ReplayParserGUI.this,
+                                        message,
+                                        "Remove replay",
+                                        JOptionPane.YES_NO_OPTION,
+                                        JOptionPane.QUESTION_MESSAGE);
+
+                                if (userOption == JOptionPane.YES_OPTION) {
+                                        // Delete replay
+                                        int row = replayTable.getSelectedRow();
+                                        ReplayDescriptor descriptor = (ReplayDescriptor) replayTable.getValueAt(row, 0);
+                                        ReplayParserGUI.this.warp.remove(descriptor.getId());
+                                        if (removeReplayFromFS.isSelected()) {
+                                                descriptor.getFile().delete();
+                                        }
+                                        // TODO Handle preferences
+                                }
                         }
                 };

src/main/java/de/erichseifert/warp/io/search/IndexHierarchy.java

@@ -85 +85 @@
                 public Node remove(String propertyGetterName, long id) {
                         Node nodeRemoved = null;
-                        for (Node node : childNodes) {
+                        Iterator<Node> childNodeIter = childNodes.iterator();
+                        while (childNodeIter.hasNext()) {
+                                Node node = childNodeIter.next();
                                 if (node.getId() == id && node.getPropertyGetterName().equals(propertyGetterName)) {
-                                        childNodes.remove(node);
+                                        childNodeIter.remove();
                                         nodeRemoved = node;
                                 }
@@ -141 +143 @@
         public Node remove(String propertyGetterName, long id) {
                 Node nodeRemoved = null;
-                for (Node node : rootNodes) {
+                Iterator<Node> rootNodeIter = rootNodes.iterator();
+                while (rootNodeIter.hasNext()) {
+                        Node node = rootNodeIter.next();
                         if (node.getId() == id && node.getPropertyGetterName().equals(propertyGetterName)) {
-                                rootNodes.remove(node);
+                                rootNodeIter.remove();
                                 nodeRemoved = node;
                         }