Author: mes
Date: 2010-11-14 15:48:03 -0800 (Sun, 14 Nov 2010)
New Revision: 22839
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/DeleteAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/ExitAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/PrintAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/RedoAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/UndoAction.java
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
Log:
updated to reflect api changes
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/DeleteAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/DeleteAction.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/DeleteAction.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -35,6 +35,7 @@
import java.util.Set;
import javax.swing.event.MenuEvent;
+import javax.swing.KeyStroke;
import org.cytoscape.application.swing.CytoscapeAction;
import org.cytoscape.model.CyTableUtil;
@@ -95,7 +96,7 @@
super(ACTION_TITLE,applicationManager);
this.networkViewManager = networkViewManager;
setPreferredMenu("Edit");
- setAcceleratorCombo(KeyEvent.VK_DELETE, 0);
+
setAcceleratorKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
graphObj = obj;
this.undo = undo;
cyRootNetworkFactory = root;
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/ExitAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/ExitAction.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/ExitAction.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -46,6 +46,8 @@
import org.cytoscape.view.model.CyNetworkViewManager;
import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.KeyStroke;
/**
@@ -63,7 +65,7 @@
super("Quit",appMgr);
this.shutdown = shutdown;
setPreferredMenu("File");
- setAcceleratorCombo(java.awt.event.KeyEvent.VK_Q,
ActionEvent.CTRL_MASK);
+ setAcceleratorKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
ActionEvent.CTRL_MASK));
}
/**
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/PrintAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/PrintAction.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/PrintAction.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -43,11 +43,13 @@
package org.cytoscape.internal.actions;
import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import java.awt.print.PrinterJob;
import java.util.Properties;
import java.util.Set;
import javax.swing.event.MenuEvent;
+import javax.swing.KeyStroke;
import org.cytoscape.application.swing.CytoscapeAction;
import org.cytoscape.session.CyApplicationManager;
@@ -73,7 +75,7 @@
public PrintAction(CyApplicationManager appMgr, Properties props ) {
super(MENU_LABEL, appMgr );
setPreferredMenu("File");
- setAcceleratorCombo(java.awt.event.KeyEvent.VK_P,
ActionEvent.CTRL_MASK);
+ setAcceleratorKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_P,
ActionEvent.CTRL_MASK));
this.props = props;
}
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/RedoAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/RedoAction.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/RedoAction.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -42,6 +42,7 @@
import javax.swing.Action;
import javax.swing.event.MenuEvent;
import javax.swing.undo.CannotUndoException;
+import javax.swing.KeyStroke;
import org.cytoscape.application.swing.CytoscapeAction;
import org.cytoscape.session.CyApplicationManager;
@@ -62,7 +63,7 @@
*/
public RedoAction(UndoSupport undo, CyApplicationManager appMgr ) {
super("Redo",appMgr);
- setAcceleratorCombo(KeyEvent.VK_Y, ActionEvent.CTRL_MASK);
+ setAcceleratorKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_Y,
ActionEvent.CTRL_MASK));
setPreferredMenu("Edit");
setEnabled(true);
this.undo = undo;
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/UndoAction.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/UndoAction.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/actions/UndoAction.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -40,6 +40,7 @@
import java.awt.event.KeyEvent;
import javax.swing.Action;
+import javax.swing.KeyStroke;
import javax.swing.event.MenuEvent;
import javax.swing.undo.CannotUndoException;
@@ -62,7 +63,7 @@
*/
public UndoAction(UndoSupport undo,CyApplicationManager appMgr) {
super("Undo",appMgr);
- setAcceleratorCombo(KeyEvent.VK_Z, ActionEvent.CTRL_MASK);
+ setAcceleratorKeyStroke(KeyStroke.getKeyStroke(KeyEvent.VK_Z,
ActionEvent.CTRL_MASK));
setPreferredMenu("Edit");
setEnabled(true);
this.undo = undo;
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
2010-11-14 23:47:52 UTC (rev 22838)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeMenuBar.java
2010-11-14 23:48:03 UTC (rev 22839)
@@ -159,17 +159,16 @@
JMenu menu = getMenu(menu_name);
menu_item = createJMenuItem(action);
- // Add an Accelerator Key, if wanted
// If it wants to be anywhere in particular, try to put it
there..
Object index_object = Integer.valueOf(-1);
//index_object = action.getPrefferedIndex();
- if (action.isAccelerated() &&
(action.getValue(Action.ACCELERATOR_KEY) == null)) {
- KeyStroke keyStroke =
KeyStroke.getKeyStroke(action.getKeyCode(), action.getKeyModifiers());
- menu_item.setAccelerator(keyStroke);
- }
+ // Add an Accelerator Key, if wanted
+ KeyStroke accelerator = action.getAcceleratorKeyStroke();
+ if ( accelerator != null )
+ menu_item.setAccelerator(accelerator);
menu.addMenuListener(action);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
