Author: kono
Date: 2011-10-21 09:25:31 -0700 (Fri, 21 Oct 2011)
New Revision: 27264
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
Log:
Load network file task enabled.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-10-21 15:52:33 UTC (rev 27263)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-10-21 16:25:31 UTC (rev 27264)
@@ -220,7 +220,7 @@
LoadMitabFileTaskFactory loadMitabFileTaskFactory = new
LoadMitabFileTaskFactory(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef);
- QuickStartTaskFactory2 quickStartTaskFactory2 = new
QuickStartTaskFactory2(openBrowserServiceRef,
importTaskUtil,cyNetworkManagerServiceRef,subnetworkBuilderUtil,
recentlyOpenedTrackerServiceRef, taskManagerServiceRef,
openSpecifiedSessionTaskFactory, openSessionTaskFactory,
loadMitabFileTaskFactory, cyApplicationConfigurationServiceRef,
applyPreferredLayoutTaskFactory);
+ QuickStartTaskFactory2 quickStartTaskFactory2 = new
QuickStartTaskFactory2(openBrowserServiceRef,
importTaskUtil,cyNetworkManagerServiceRef,subnetworkBuilderUtil,
recentlyOpenedTrackerServiceRef, taskManagerServiceRef,
openSpecifiedSessionTaskFactory, openSessionTaskFactory,
loadMitabFileTaskFactory, cyApplicationConfigurationServiceRef,
loadNetworkFileTaskFactory);
BioGridPreprocessor bioGridPreprocessor = new
BioGridPreprocessor(cyPropertyServiceRef,cyApplicationConfigurationServiceRef);
ConnectSelectedNodesTaskFactory connectSelectedNodesTaskFactory
= new
ConnectSelectedNodesTaskFactory(undoSupportServiceRef,cyApplicationManagerServiceRef,cyEventHelperRef);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
2011-10-21 15:52:33 UTC (rev 27263)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
2011-10-21 16:25:31 UTC (rev 27264)
@@ -5,6 +5,9 @@
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
@@ -33,11 +36,13 @@
private Window parent;
private DownloadBiogridDataTaskFactory taskFactory;
+ private final TaskFactory loadNetworkFileTF;
CreateNewNetworkPanel(Window parent, final TaskManager guiTaskManager,
final LoadMitabFileTaskFactory loadTF,
- final CyApplicationConfiguration config, final
TaskFactory layoutTF) {
+ final CyApplicationConfiguration config, final
TaskFactory loadNetworkFileTF) {
this.loadTF = loadTF;
this.parent = parent;
+ this.loadNetworkFileTF = loadNetworkFileTF;
this.guiTaskManager = guiTaskManager;
this.networkList = new JComboBox();
taskFactory = new DownloadBiogridDataTaskFactory(networkList,
config);
@@ -52,6 +57,15 @@
layout.setToolTipText("Note: This option may take minutes to
finish for large networks!");
this.loadNetwork = new JLabel("From file...");
+ loadNetwork.addMouseListener(new MouseAdapter() {
+
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ // Load network from file.
+ parent.dispose();
+ guiTaskManager.execute(loadNetworkFileTF);
+ }
+ });
this.setBorder(new LineBorder(new Color(0, 0, 0, 0), 10));
this.fromDB = new JLabel("From public data:");
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
2011-10-21 15:52:33 UTC (rev 27263)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
2011-10-21 16:25:31 UTC (rev 27264)
@@ -52,7 +52,7 @@
private final LoadMitabFileTaskFactory loadTF;
private final CyApplicationConfiguration config;
- private final TaskFactory layoutTF;
+ private final TaskFactory loadNetworkTF;
WelcomeScreenDialog(Component parent, OpenBrowser
openBrowserServiceRef, RecentlyOpenedTracker fileTracker,
TaskManager guiTaskManager,
OpenSpecifiedSessionTaskFactory taskFactory,
@@ -62,7 +62,7 @@
this.loadTF = loadTF;
this.fileTracker = fileTracker;
this.config = config;
- this.layoutTF = layoutTF;
+ this.loadNetworkTF = layoutTF;
this.guiTaskManager = guiTaskManager;
this.taskFactory = taskFactory;
@@ -141,7 +141,7 @@
buildHelpPanel(panel1, new OpenPanel(this, fileTracker,
guiTaskManager, taskFactory, openTaskFactory),
"Open a Recent Session");
- buildHelpPanel(panel2, new CreateNewNetworkPanel(this,
guiTaskManager, loadTF, config, layoutTF), "Create New Network");
+ buildHelpPanel(panel2, new CreateNewNetworkPanel(this,
guiTaskManager, loadTF, config, loadNetworkTF), "Create New Network");
buildHelpPanel(panel3, new HelpPanel(openBrowserServiceRef),
"Help");
buildHelpPanel(panel4, new LogoPanel(), "Latest News");
--
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.
