Author: ruschein
Date: 2010-10-27 17:11:43 -0700 (Wed, 27 Oct 2010)
New Revision: 22538
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Fixed fallout from refactoring CyNetworkManager.
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-10-28 00:00:08 UTC (rev 22537)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-10-28 00:11:43 UTC (rev 22538)
@@ -1,15 +1,8 @@
/*
File: NetworkPanel.java
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -36,6 +29,7 @@
*/
package cytoscape.internal.view;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -71,15 +65,17 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.RowSetMicroListener;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.session.CyNetworkManager;
-import org.cytoscape.session.events.NetworkAboutToBeDestroyedEvent;
-import org.cytoscape.session.events.NetworkAboutToBeDestroyedListener;
-import org.cytoscape.session.events.NetworkAddedEvent;
-import org.cytoscape.session.events.NetworkAddedListener;
-import org.cytoscape.session.events.NetworkViewAboutToBeDestroyedEvent;
-import org.cytoscape.session.events.NetworkViewAboutToBeDestroyedListener;
-import org.cytoscape.session.events.NetworkViewAddedEvent;
-import org.cytoscape.session.events.NetworkViewAddedListener;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.events.NetworkAddedEvent;
+import org.cytoscape.model.events.NetworkAddedListener;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedEvent;
+import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
+import org.cytoscape.view.model.events.NetworkViewAddedEvent;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SetCurrentNetworkEvent;
import org.cytoscape.session.events.SetCurrentNetworkListener;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
@@ -103,9 +99,7 @@
import cytoscape.internal.task.TaskFactoryTunableAction;
import cytoscape.view.CyAction;
-/**
- *
- */
+
public class NetworkPanel extends JPanel implements TreeSelectionListener,
SetCurrentNetworkViewListener,
SetCurrentNetworkListener, NetworkAddedListener,
@@ -122,7 +116,9 @@
private JPopupMenu popup;
private JSplitPane split;
private final NetworkTreeTableModel treeTableModel;
+ private final CyApplicationManager applicationManager;
private final CyNetworkManager netmgr;
+ private final CyNetworkViewManager networkViewManager;
private Long currentNetId;
private final TaskManager taskManager;
private Map<TaskFactory,JMenuItem> popupMap;
@@ -136,12 +132,16 @@
*
* @param desktop
*/
- public NetworkPanel(final CyNetworkManager netmgr, final
BirdsEyeViewHandler bird,
- final TaskManager taskManager, final CyEventHelper
eventHelper)
+ public NetworkPanel(final CyApplicationManager applicationManager,
final CyNetworkManager netmgr,
+ final CyNetworkViewManager networkViewManager,
+ final BirdsEyeViewHandler bird, final TaskManager
taskManager,
+ final CyEventHelper eventHelper)
{
super();
+ this.applicationManager = applicationManager;
this.netmgr = netmgr;
+ this.networkViewManager = networkViewManager;
this.taskManager = taskManager;
this.eventHelper = eventHelper;
@@ -395,7 +395,7 @@
+ nde.getNetworkView().getModel().getSUID());
// Set current network view to the new one.
-
this.netmgr.setCurrentNetworkView(nde.getNetworkView().getModel().getSUID());
+
applicationManager.setCurrentNetworkView(nde.getNetworkView().getModel().getSUID());
treeTable.getTree().updateUI();
}
@@ -505,7 +505,7 @@
return;
}
- netmgr.setCurrentNetwork(node.getNetworkID());
+ applicationManager.setCurrentNetwork(node.getNetworkID());
// creates a list of all selected networks
List<Long> networkList = new LinkedList<Long>();
@@ -522,9 +522,8 @@
ex.printStackTrace();
}
- if (networkList.size() > 0) {
- netmgr.setSelectedNetworkViews(networkList);
- }
+ if (networkList.size() > 0)
+ applicationManager.setSelectedNetworkViews(networkList);
}
/**
@@ -665,7 +664,7 @@
else
setToolTipText("Root");
- return netmgr.viewExists(node.getNetworkID());
+ return
networkViewManager.viewExists(node.getNetworkID());
}
}
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 00:00:08 UTC (rev 22537)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 00:11:43 UTC (rev 22538)
@@ -82,7 +82,9 @@
</bean>
<bean name="networkPanel" class="cytoscape.internal.view.NetworkPanel">
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="birdsEyeViewHandler" />
<constructor-arg ref="guiTaskManagerServiceRef" />
<constructor-arg ref="cyEventHelperServiceRef" />
--
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.
