Author: kono
Date: 2011-12-06 17:57:24 -0800 (Tue, 06 Dec 2011)
New Revision: 27725
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
Log:
Welcome Screen is now using global Bookmark CyProperty.
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-12-07 01:56:50 UTC (rev 27724)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/CreateNewNetworkPanel.java
2011-12-07 01:57:24 UTC (rev 27725)
@@ -7,14 +7,17 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
-import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.imageio.ImageIO;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -23,6 +26,9 @@
import javax.swing.border.LineBorder;
import org.cytoscape.application.CyApplicationConfiguration;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+import org.cytoscape.property.bookmark.DataSource;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskManager;
@@ -44,19 +50,47 @@
private DownloadBiogridDataTaskFactory taskFactory;
private final TaskFactory loadNetworkFileTF;
+
+ private final BookmarksUtil bkUtil;
+ private final Bookmarks bookmarks;
+ private final Map<String, String> dataSourceMap;
CreateNewNetworkPanel(Window parent, final TaskManager guiTaskManager,
final LoadMitabFileTaskFactory loadTF,
- final CyApplicationConfiguration config, final
TaskFactory loadNetworkFileTF) {
+ final CyApplicationConfiguration config, final
TaskFactory loadNetworkFileTF, BookmarksUtil bkUtil,
+ Bookmarks bookmarks) {
this.loadTF = loadTF;
this.parent = parent;
this.loadNetworkFileTF = loadNetworkFileTF;
this.guiTaskManager = guiTaskManager;
+ this.bkUtil = bkUtil;
+ this.bookmarks = bookmarks;
+ this.dataSourceMap = new HashMap<String, String>();
+
this.networkList = new JComboBox();
- taskFactory = new DownloadBiogridDataTaskFactory(networkList,
config);
- guiTaskManager.execute(taskFactory);
+ // taskFactory = new DownloadBiogridDataTaskFactory(networkList,
+ // config);
+ // guiTaskManager.execute(taskFactory);
+ setFromBookmark();
+
initComponents();
}
+
+ private void setFromBookmark() {
+ DefaultComboBoxModel theModel = new DefaultComboBoxModel();
+ // Extract the URL entries
+ List<DataSource> dataSources =
bkUtil.getDataSourceList("network", bookmarks.getCategory());
+ if (dataSources != null) {
+ for(DataSource ds: dataSources) {
+ final String link = ds.getHref();
+ final String sourceName = ds.getName();
+ dataSourceMap.put(sourceName, link);
+ theModel.addElement(sourceName);
+ }
+ }
+ this.networkList.setModel(theModel);
+ }
+
private void initComponents() {
BufferedImage openIconImg = null;
@@ -103,7 +137,7 @@
public void actionPerformed(ActionEvent ae) {
try {
loadNetwork();
- } catch (URISyntaxException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -112,7 +146,7 @@
private boolean firstSelection = false;
- private void loadNetwork() throws URISyntaxException {
+ private void loadNetwork() throws URISyntaxException,
MalformedURLException {
Object file = networkList.getSelectedItem();
if(file == null || firstSelection == false) {
@@ -120,13 +154,14 @@
return;
}
- final URL url = taskFactory.getMap().get(file);
+ //final URL url = taskFactory.getMap().get(file);
+ final URL url = new URL(dataSourceMap.get(file));
if(layout.isSelected())
loadTF.setApplyLayout(true);
else
loadTF.setApplyLayout(false);
- loadTF.setFile(new File(url.toURI()));
+ loadTF.setURL(url);
guiTaskManager.execute(loadTF);
parent.dispose();
}
--
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.
