Author: kono
Date: 2011-12-06 17:56:50 -0800 (Tue, 06 Dec 2011)
New Revision: 27724
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/quickstart/WelcomeScreenTaskFactory.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTaskFactory.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/ShowWelcomeScreenTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
Log:
Welcome Screen is now using global Bookmark CyProperty.
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-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -20,6 +20,8 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.work.SynchronousTaskManager;
import org.cytoscape.property.CyProperty;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.io.write.CySessionWriterManager;
import org.cytoscape.io.write.CyNetworkViewWriterManager;
@@ -128,6 +130,9 @@
public void start(BundleContext bc) {
+ CyProperty<Bookmarks> bookmarkServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=bookmarks)");
+ BookmarksUtil bookmarksUtilServiceRef =
getService(bc,BookmarksUtil.class);
+
OpenBrowser openBrowserServiceRef =
getService(bc,OpenBrowser.class);
CyEventHelper cyEventHelperRef =
getService(bc,CyEventHelper.class);
CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
@@ -229,7 +234,7 @@
LoadMitabFileTaskFactory loadMitabFileTaskFactory = new
LoadMitabFileTaskFactory(cyNetworkReaderManagerServiceRef,cyNetworkManagerServiceRef,cyNetworkViewManagerServiceRef,cyPropertyServiceRef,cyNetworkNamingServiceRef);
- WelcomeScreenTaskFactory welcomeTaskFactory = new
WelcomeScreenTaskFactory(openBrowserServiceRef,
importTaskUtil,cyNetworkManagerServiceRef,subnetworkBuilderUtil,
recentlyOpenedTrackerServiceRef, taskManagerServiceRef,
openSpecifiedSessionTaskFactory, openSessionTaskFactory,
loadMitabFileTaskFactory, cyApplicationConfigurationServiceRef,
loadNetworkFileTaskFactory);
+ WelcomeScreenTaskFactory welcomeTaskFactory = new
WelcomeScreenTaskFactory(openBrowserServiceRef,
importTaskUtil,cyNetworkManagerServiceRef,subnetworkBuilderUtil,
recentlyOpenedTrackerServiceRef, taskManagerServiceRef,
openSpecifiedSessionTaskFactory, openSessionTaskFactory,
loadMitabFileTaskFactory, cyApplicationConfigurationServiceRef,
loadNetworkFileTaskFactory, bookmarksUtilServiceRef,
bookmarkServiceRef.getProperties());
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/quickstart/WelcomeScreenTaskFactory.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/WelcomeScreenTaskFactory.java
2011-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/WelcomeScreenTaskFactory.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -3,6 +3,8 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.io.util.RecentlyOpenedTracker;
import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
import
org.cytoscape.task.internal.quickstart.subnetworkbuilder.SubnetworkBuilderUtil;
import org.cytoscape.task.internal.session.OpenSessionTaskFactory;
import org.cytoscape.task.internal.welcome.LoadMitabFileTaskFactory;
@@ -24,18 +26,25 @@
private final LoadMitabFileTaskFactory loadTF;
private final CyApplicationConfiguration config;
private final TaskFactory layoutTF;
+
+ private final BookmarksUtil bkUtil;
+ private final Bookmarks bookmarks;
public WelcomeScreenTaskFactory(OpenBrowser openBrowserServiceRef,
final ImportTaskUtil util,
final CyNetworkManager networkManager, final
SubnetworkBuilderUtil subnetworkUtil,
RecentlyOpenedTracker fileTracker, TaskManager
guiTaskManager, OpenSpecifiedSessionTaskFactory taskFactory,
final OpenSessionTaskFactory openTaskFactory, final
LoadMitabFileTaskFactory loadTF,
- final CyApplicationConfiguration config, final
TaskFactory layoutTF) {
+ final CyApplicationConfiguration config, final
TaskFactory layoutTF, BookmarksUtil bkUtil,
+ Bookmarks bookmarks) {
super(util, networkManager, subnetworkUtil);
this.openBrowserServiceRef = openBrowserServiceRef;
this.fileTracker = fileTracker;
this.loadTF = loadTF;
this.config = config;
this.layoutTF = layoutTF;
+
+ this.bkUtil = bkUtil;
+ this.bookmarks = bookmarks;
this.guiTaskManager = guiTaskManager;
this.taskFactory = taskFactory;
@@ -46,6 +55,6 @@
// return new TaskIterator(new StartTask(new QuickStartState(),
util,
// networkManager, subnetworkUtil, openBrowserServiceRef));
return new TaskIterator(new
ShowWelcomeScreenTask(openBrowserServiceRef, fileTracker, this.guiTaskManager,
- this.taskFactory, openTaskFactory, loadTF,
config, layoutTF));
+ this.taskFactory, openTaskFactory, loadTF,
config, layoutTF, bkUtil, bookmarks));
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
2011-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -1,6 +1,7 @@
package org.cytoscape.task.internal.welcome;
import java.io.File;
+import java.net.URL;
import java.util.Properties;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -12,17 +13,17 @@
public class LoadMitabFileTask extends AbstractLoadNetworkTask {
- private final File file;
+ private final URL url;
private final boolean applyLayout;
- public LoadMitabFileTask(boolean applyLayout, final File file,
CyNetworkReaderManager mgr, CyNetworkManager netmgr,
+ public LoadMitabFileTask(boolean applyLayout, final URL url,
CyNetworkReaderManager mgr, CyNetworkManager netmgr,
final CyNetworkViewManager networkViewManager, final
Properties props, CyNetworkNaming namingUtil) {
super(mgr, netmgr, networkViewManager, props, namingUtil);
- if (file == null)
+ if (url == null)
throw new NullPointerException("File is null.");
- this.file = file;
+ this.url = url;
this.applyLayout = applyLayout;
}
@@ -30,21 +31,21 @@
public void run(TaskMonitor taskMonitor) throws Exception {
this.taskMonitor = taskMonitor;
- reader = mgr.getReader(file.toURI(), file.getName());
+ reader = mgr.getReader(url.toURI(), url.toString());
if (cancelled)
return;
if (reader == null)
- throw new NullPointerException("Failed to find
appropriate reader for file: " + file);
+ throw new NullPointerException("Failed to find
appropriate reader for file: " + url.toString());
if(applyLayout)
props.setProperty("preferredLayoutAlgorithm",
"force-directed");
else
props.remove("preferredLayoutAlgorithm");
- uri = file.toURI();
- name = file.getName();
+ uri = url.toURI();
+ name = url.toString();
this.viewThreshold = Integer.MAX_VALUE;
loadNetwork(reader);
taskMonitor.setProgress(1.0);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTaskFactory.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTaskFactory.java
2011-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTaskFactory.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -1,6 +1,6 @@
package org.cytoscape.task.internal.welcome;
-import java.io.File;
+import java.net.URL;
import java.util.Properties;
import org.cytoscape.io.read.CyNetworkReaderManager;
@@ -20,7 +20,7 @@
private CyNetworkNaming cyNetworkNaming;
- private File file;
+ private URL url;
private boolean apply = false;
public LoadMitabFileTaskFactory(CyNetworkReaderManager mgr,
CyNetworkManager netmgr,
@@ -33,8 +33,8 @@
this.cyNetworkNaming = cyNetworkNaming;
}
- void setFile(final File file) {
- this.file = file;
+ void setURL(final URL url) {
+ this.url = url;
}
void setApplyLayout(boolean apply) {
@@ -42,7 +42,7 @@
}
public TaskIterator createTaskIterator() {
- return new TaskIterator(new LoadMitabFileTask(apply, file, mgr,
netmgr, networkViewManager, props, cyNetworkNaming));
+ return new TaskIterator(new LoadMitabFileTask(apply, url, mgr,
netmgr, networkViewManager, props, cyNetworkNaming));
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/ShowWelcomeScreenTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/ShowWelcomeScreenTask.java
2011-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/ShowWelcomeScreenTask.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -5,6 +5,8 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.io.util.RecentlyOpenedTracker;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.task.internal.session.OpenSessionTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.AbstractTask;
@@ -23,16 +25,23 @@
private final LoadMitabFileTaskFactory loadTF;
private final CyApplicationConfiguration config;
private final TaskFactory layoutTF;
+
+ private final BookmarksUtil bkUtil;
+ private final Bookmarks bookmarks;
public ShowWelcomeScreenTask(final OpenBrowser openBrowserServiceRef,
RecentlyOpenedTracker fileTracker,
TaskManager guiTaskManager,
OpenSpecifiedSessionTaskFactory taskFactory,
final OpenSessionTaskFactory openTaskFactory, final
LoadMitabFileTaskFactory loadTF,
- final CyApplicationConfiguration config, final
TaskFactory layoutTF) {
+ final CyApplicationConfiguration config, final
TaskFactory layoutTF, BookmarksUtil bkUtil,
+ Bookmarks bookmarks) {
this.openBrowserServiceRef = openBrowserServiceRef;
this.openTaskFactory = openTaskFactory;
this.loadTF = loadTF;
this.config = config;
this.layoutTF = layoutTF;
+
+ this.bkUtil = bkUtil;
+ this.bookmarks = bookmarks;
this.fileTracker = fileTracker;
@@ -46,7 +55,7 @@
@Override
public void run() {
final JDialog welcome = new
WelcomeScreenDialog(null, openBrowserServiceRef, fileTracker,
- guiTaskManager, taskFactory,
openTaskFactory, loadTF, config, layoutTF);
+ guiTaskManager, taskFactory,
openTaskFactory, loadTF, config, layoutTF, bkUtil, bookmarks);
welcome.setVisible(true);
}
});
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-12-07 00:56:01 UTC (rev 27723)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/WelcomeScreenDialog.java
2011-12-07 01:56:50 UTC (rev 27724)
@@ -19,6 +19,8 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.io.util.RecentlyOpenedTracker;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
import org.cytoscape.task.internal.session.OpenSessionTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.TaskFactory;
@@ -53,16 +55,22 @@
private final LoadMitabFileTaskFactory loadTF;
private final CyApplicationConfiguration config;
private final TaskFactory loadNetworkTF;
+
+ private final BookmarksUtil bkUtil;
+ private final Bookmarks bookmarks;
WelcomeScreenDialog(Component parent, OpenBrowser
openBrowserServiceRef, RecentlyOpenedTracker fileTracker,
TaskManager guiTaskManager,
OpenSpecifiedSessionTaskFactory taskFactory,
final OpenSessionTaskFactory openTaskFactory, final
LoadMitabFileTaskFactory loadTF,
- final CyApplicationConfiguration config, final
TaskFactory layoutTF) {
+ final CyApplicationConfiguration config, final
TaskFactory layoutTF, BookmarksUtil bkUtil,
+ Bookmarks bookmarks) {
this.openBrowserServiceRef = openBrowserServiceRef;
this.loadTF = loadTF;
this.fileTracker = fileTracker;
this.config = config;
this.loadNetworkTF = layoutTF;
+ this.bkUtil = bkUtil;
+ this.bookmarks = bookmarks;
this.guiTaskManager = guiTaskManager;
this.taskFactory = taskFactory;
@@ -141,7 +149,7 @@
buildHelpPanel(panel1, new OpenPanel(this, fileTracker,
guiTaskManager, taskFactory, openTaskFactory),
"Open a Recent Session");
- buildHelpPanel(panel2, new CreateNewNetworkPanel(this,
guiTaskManager, loadTF, config, loadNetworkTF), "Create New Network");
+ buildHelpPanel(panel2, new CreateNewNetworkPanel(this,
guiTaskManager, loadTF, config, loadNetworkTF, bkUtil, bookmarks), "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.
