Author: kono
Date: 2011-12-06 13:55:48 -0800 (Tue, 06 Dec 2011)
New Revision: 27715

Modified:
   
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
   
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
Log:
Shortcut for Import Network From Database had been added (ALT+L).

Modified: 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
===================================================================
--- 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
   2011-12-06 21:35:52 UTC (rev 27714)
+++ 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/CyActivator.java
   2011-12-06 21:55:48 UTC (rev 27715)
@@ -1,4 +1,3 @@
-
 package org.cytoscape.webservice.internal;
 
 import org.cytoscape.application.swing.CySwingApplication;
@@ -10,7 +9,6 @@
 
 import org.cytoscape.application.swing.CyAction;
 
-
 import org.osgi.framework.BundleContext;
 
 import org.cytoscape.service.util.AbstractCyActivator;
@@ -25,15 +23,16 @@
        }
 
        public void start(BundleContext bc) {
-               CyApplicationManager cyApplicationManagerServiceRef = 
getService(bc,CyApplicationManager.class);
-               CySwingApplication cySwingApplicationServiceRef = 
getService(bc,CySwingApplication.class);
-               DialogTaskManager taskManagerServiceRef = 
getService(bc,DialogTaskManager.class);
-               
+               CyApplicationManager cyApplicationManagerServiceRef = 
getService(bc, CyApplicationManager.class);
+               CySwingApplication cySwingApplicationServiceRef = 
getService(bc, CySwingApplication.class);
+               DialogTaskManager taskManagerServiceRef = getService(bc, 
DialogTaskManager.class);
+
                UnifiedNetworkImportDialog unifiedNetworkImportDialog = new 
UnifiedNetworkImportDialog(taskManagerServiceRef);
-               ShowNetworkImportDialogAction showNetworkImportDialogAction = 
new 
ShowNetworkImportDialogAction(cyApplicationManagerServiceRef,cySwingApplicationServiceRef,unifiedNetworkImportDialog);
-               
-               
registerService(bc,showNetworkImportDialogAction,CyAction.class, new 
Properties());
-               registerServiceListener(bc, unifiedNetworkImportDialog, 
"addNetworkImportClient", "removeNetworkImportClient", 
NetworkImportWebServiceClient.class);    
+               ShowNetworkImportDialogAction showNetworkImportDialogAction = 
new ShowNetworkImportDialogAction(
+                               cyApplicationManagerServiceRef, 
cySwingApplicationServiceRef, unifiedNetworkImportDialog);
+
+               registerService(bc, showNetworkImportDialogAction, 
CyAction.class, new Properties());
+               registerServiceListener(bc, unifiedNetworkImportDialog, 
"addNetworkImportClient", "removeNetworkImportClient",
+                               NetworkImportWebServiceClient.class);
        }
 }
-

Modified: 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
===================================================================
--- 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
    2011-12-06 21:35:52 UTC (rev 27714)
+++ 
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/task/ShowNetworkImportDialogAction.java
    2011-12-06 21:55:48 UTC (rev 27715)
@@ -2,7 +2,11 @@
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 
+import javax.swing.KeyStroke;
+
 import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.application.swing.AbstractCyAction;
 import org.cytoscape.application.swing.CySwingApplication;
@@ -20,12 +24,13 @@
 
        private final Window parent;
 
-       public ShowNetworkImportDialogAction(
-                       final CyApplicationManager applicationManager,
-                       final CySwingApplication app,
+       public ShowNetworkImportDialogAction(final CyApplicationManager 
applicationManager, final CySwingApplication app,
                        final UnifiedNetworkImportDialog dialog) {
                super("Public Databases...", applicationManager);
+               
                setPreferredMenu("File.Import.Network");
+               final KeyStroke shortcut = 
KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.ALT_DOWN_MASK);
+               setAcceleratorKeyStroke(shortcut);
 
                if (dialog == null)
                        throw new NullPointerException("Dialog is null.");

-- 
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.

Reply via email to