Author: jflesch
Date: 2007-07-11 20:42:38 +0000 (Wed, 11 Jul 2007)
New Revision: 14034
Modified:
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferManagementHelper.java
trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferTable.java
Log:
Add support for the key 'delete' in the plugins QueueWatcher, IndexBrowser and
TransferLogs
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-07-11 20:21:14 UTC (rev 14033)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2007-07-11 20:42:38 UTC (rev 14034)
@@ -39,6 +39,9 @@
import javax.swing.tree.TreeNode;
import javax.swing.JScrollPane;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
import java.text.DateFormat;
import thaw.gui.IconBox;
@@ -79,7 +82,9 @@
}
- public static abstract class BasicIndexAction implements IndexAction,
Runnable {
+ public static abstract class BasicIndexAction
+ implements IndexAction, Runnable {
+
private FCPQueueManager queueManager;
private AbstractButton actionSource;
private IndexTreeNode target;
@@ -94,10 +99,12 @@
target = null;
this.queueManager = queueManager;
- if (actionSource != null)
+ if (actionSource != null) {
actionSource.addActionListener(this);
+ }
}
+
public AbstractButton getActionSource() {
return actionSource;
}
@@ -122,11 +129,17 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == actionSource) {
- Thread th = new Thread(this);
- th.start();
+ startThread();
}
}
+
+ protected void startThread() {
+ Thread th = new Thread(this);
+ th.start();
+ }
+
+
public void run() {
apply();
}
@@ -1044,8 +1057,9 @@
/**
* Can be used on indexes or index categories.
+ * Can be also used as a keylistener : will only react with the key
'delete'
*/
- public static class IndexDeleter extends BasicIndexAction {
+ public static class IndexDeleter extends BasicIndexAction implements
KeyListener {
public IndexDeleter(final IndexBrowserPanel indexBrowser, final
AbstractButton actionSource) {
super(null, indexBrowser, actionSource);
}
@@ -1058,6 +1072,20 @@
&&
(getIndexBrowserPanel().getIndexTree() != null));
}
+ public void keyPressed(KeyEvent e) {
+
+ }
+
+ public void keyReleased(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_DELETE) {
+ startThread();
+ }
+ }
+
+ public void keyTyped(KeyEvent e) {
+
+ }
+
public void apply() {
IndexManagementHelper.deleteNode(getIndexBrowserPanel(), getTarget());
}
@@ -1076,6 +1104,8 @@
} else {
indexBrowser.getIndexTree().refresh();
}
+
+ indexBrowser.getIndexTree().updateMenuState(null);
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2007-07-11
20:21:14 UTC (rev 14033)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexTree.java 2007-07-11
20:42:38 UTC (rev 14034)
@@ -7,6 +7,7 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
+import java.awt.event.KeyEvent;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -353,6 +354,8 @@
button.setToolTipText(I18n.getMessage("thaw.plugin.index.delete"));
action = new IndexManagementHelper.IndexDeleter(indexBrowser,
button);
action.setTarget(getRoot());
+ if (!selectionOnly)
+
tree.addKeyListener((IndexManagementHelper.IndexDeleter)action);
toolbarModifier.addButtonToTheToolbar(button);
toolbarActions.add(action);
Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2007-07-11 20:21:14 UTC (rev 14033)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
2007-07-11 20:42:38 UTC (rev 14034)
@@ -515,7 +515,12 @@
public void keyPressed(final KeyEvent e) { }
- public void keyReleased(final KeyEvent e) { refreshDetailPanel(); }
+ public void keyReleased(final KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_DELETE) {
+ removeSelectedTransfers();
+ }
+ refreshDetailPanel();
+ }
public void keyTyped(final KeyEvent e) { }
}
Modified:
trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferManagementHelper.java
2007-07-11 20:21:14 UTC (rev 14033)
+++ trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferManagementHelper.java
2007-07-11 20:42:38 UTC (rev 14034)
@@ -2,7 +2,10 @@
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.KeyEvent;
+
import javax.swing.AbstractButton;
import java.util.Vector;
@@ -24,7 +27,10 @@
}
- public static class TransferRemover implements TransferAction {
+ /*
+ * As a key listener, it reacts with the key 'suppr'
+ */
+ public static class TransferRemover implements TransferAction,
KeyListener {
private AbstractButton b;
private Vector targets;
private TransferTable tt;
@@ -43,11 +49,21 @@
targets = transfers;
}
+ public void keyPressed(final KeyEvent e) { }
+
+ public void keyReleased(final KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_DELETE) {
+ actionPerformed(null);
+ }
+ }
+
+ public void keyTyped(final KeyEvent e) { }
+
public void actionPerformed(ActionEvent e) {
if (targets == null)
return;
- if (b == null || e.getSource() == b) {
+ if (e == null || b == null || e.getSource() == b) {
for (Iterator it = targets.iterator();
it.hasNext(); ) {
Modified: trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferTable.java
2007-07-11 20:21:14 UTC (rev 14033)
+++ trunk/apps/Thaw/src/thaw/plugins/transferLogs/TransferTable.java
2007-07-11 20:42:38 UTC (rev 14034)
@@ -59,7 +59,7 @@
* right click menu : copy key(s) to clipboard
*/
public class TransferTable implements MouseListener {
- public final static int NMB_ELEMENTS_PER_PAGE = 20;
+ public final static int NMB_ELEMENTS_PER_PAGE = 30;
public final static int DEFAULT_LINE_HEIGHT = 18;
public final static String[] COLUMN_NAMES = {
@@ -79,6 +79,8 @@
private JPopupMenu rightClickMenu;
private Vector rightClickActions;
+ private TransferManagementHelper.TransferRemover remover;
+
private DateFormat dateFormat;
@@ -114,6 +116,9 @@
panel.add(new JScrollPane(table), BorderLayout.CENTER);
panel.add(pageSelecter.getPanel(), BorderLayout.SOUTH);
+ remover = new TransferManagementHelper.TransferRemover(null,
this);
+ table.addKeyListener(remover);
+
refresh();
}
@@ -512,6 +517,7 @@
if (e.getButton() == MouseEvent.BUTTON1) {
updateToolbar(selection);
+ remover.setTarget(selection);
}
if (e.getButton() == MouseEvent.BUTTON3) {
