Author: mes
Date: 2010-10-28 11:07:41 -0700 (Thu, 28 Oct 2010)
New Revision: 22548
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/BookmarkAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteEdit.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/ExitAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PreferenceAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/RedoAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/UndoAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenuManager.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/SettingsAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkCollectionTaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewCollectionTaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewTaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/CytoscapeMenuPopulator.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpAboutTask.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpContentsTask.java
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
Log:
fixed all compiler errors related to CyNetworkManager diaspora
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/BookmarkAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/BookmarkAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/BookmarkAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -44,7 +44,8 @@
import java.awt.event.ActionEvent;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import cytoscape.internal.dialogs.BookmarkDialogImpl;
import cytoscape.internal.dialogs.BookmarkDialogFactoryImpl;
import cytoscape.view.CytoscapeAction;
@@ -61,8 +62,8 @@
/**
* Creates a new BookmarkAction object.
*/
- public BookmarkAction(CySwingApplication desktop, CyNetworkManager
netmgr, BookmarkDialogFactoryImpl bookmarkDialogFactory) {
- super("Bookmarks...", netmgr);
+ public BookmarkAction(CySwingApplication desktop, CyApplicationManager
appMgr, CyNetworkViewManager netViewMgr, BookmarkDialogFactoryImpl
bookmarkDialogFactory) {
+ super("Bookmarks...", appMgr, netViewMgr);
this.bookmarkDialogFactory = bookmarkDialogFactory;
System.out.println("BookmarkAction()...");
setPreferredMenu("Edit.Preferences");
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -90,8 +90,8 @@
* @param obj the object to be deleted
*/
- public DeleteAction(CyTableEntry obj, final UndoSupport undo, final
CyRootNetworkFactory root, CyNetworkManager netmgr) {
- super(ACTION_TITLE,netmgr);
+ public DeleteAction(CyTableEntry obj, final UndoSupport undo, final
CyRootNetworkFactory root, final CyApplicationManager applicationManager, final
CyNetworkViewManager networkViewManager) {
+ super(ACTION_TITLE,applicationManager, networkViewManager);
setPreferredMenu("Edit");
setAcceleratorCombo(KeyEvent.VK_DELETE, 0);
graphObj = obj;
@@ -143,7 +143,7 @@
edges.add( cyEdge );
}
- undo.getUndoableEditSupport().postEdit( new
DeleteEdit(cyNet,nodes,edges,this, netmgr) );
+ undo.getUndoableEditSupport().postEdit( new
DeleteEdit(cyNet,nodes,edges,this, networkViewManager) );
// delete the actual nodes and edges
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteEdit.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteEdit.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteEdit.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -9,7 +9,7 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.subnetwork.CySubNetwork;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -28,18 +28,18 @@
double[] yPos;
final CySubNetwork net;
final DeleteAction deleteAction;
- final CyNetworkManager netmgr;
+ final CyNetworkViewManager netViewMgr;
- DeleteEdit(CySubNetwork net, Set<CyNode> nodes, Set<CyEdge> edges,
DeleteAction deleteAction, CyNetworkManager netmgr) {
+ DeleteEdit(CySubNetwork net, Set<CyNode> nodes, Set<CyEdge> edges,
DeleteAction deleteAction, CyNetworkViewManager netViewMgr) {
super("Delete");
this.deleteAction = deleteAction;
if ( net == null )
throw new NullPointerException("network is null");
this.net = net;
- if ( netmgr == null )
+ if ( netViewMgr == null )
throw new NullPointerException("network manager is
null");
- this.netmgr = netmgr;
+ this.netViewMgr = netViewMgr;
if ( nodes == null )
throw new NullPointerException("nodes is null");
@@ -52,7 +52,7 @@
// save the positions of the nodes
xPos = new double[nodes.size()];
yPos = new double[nodes.size()];
- CyNetworkView netView = netmgr.getNetworkView(net.getSUID());
+ CyNetworkView netView =
netViewMgr.getNetworkView(net.getSUID());
if ( netView != null ) {
int i = 0;
for ( CyNode n : nodes ) {
@@ -72,7 +72,7 @@
for ( CyEdge e : edges )
net.removeEdge(e);
- CyNetworkView netView = netmgr.getNetworkView(net.getSUID());
+ CyNetworkView netView =
netViewMgr.getNetworkView(net.getSUID());
// Manually call update presentation
netView.updateView();
@@ -88,7 +88,7 @@
for ( CyEdge e : edges )
net.addEdge(e);
- CyNetworkView netView = netmgr.getNetworkView(net.getSUID());
+ CyNetworkView netView =
netViewMgr.getNetworkView(net.getSUID());
if ( netView != null ) {
int i = 0;
for ( CyNode n : nodes ) {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/ExitAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/ExitAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/ExitAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -40,7 +40,8 @@
// $Author: mes $
package cytoscape.internal.actions;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import cytoscape.CytoscapeShutdown;
import cytoscape.view.CytoscapeAction;
@@ -58,8 +59,8 @@
/**
* Creates a new ExitAction object.
*/
- public ExitAction(CyNetworkManager netmgr, CytoscapeShutdown shutdown) {
- super("Quit",netmgr);
+ public ExitAction(CyApplicationManager appMgr, CyNetworkViewManager
netViewMgr, CytoscapeShutdown shutdown) {
+ super("Quit",appMgr,netViewMgr);
this.shutdown = shutdown;
setPreferredMenu("File");
setAcceleratorCombo(java.awt.event.KeyEvent.VK_Q,
ActionEvent.CTRL_MASK);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PreferenceAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PreferenceAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PreferenceAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -42,7 +42,8 @@
//-------------------------------------------------------------------------
package cytoscape.internal.actions;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import cytoscape.internal.dialogs.PreferencesDialogImpl;
import cytoscape.internal.dialogs.PreferencesDialogFactoryImpl;
import cytoscape.view.CytoscapeAction;
@@ -62,8 +63,8 @@
*/
private CySwingApplication desktop;
private PreferencesDialogFactoryImpl pdf;
- public PreferenceAction(CySwingApplication desktop, CyNetworkManager
netmgr, PreferencesDialogFactoryImpl pdf ) {
- super("Properties...",netmgr);
+ public PreferenceAction(CySwingApplication desktop,
CyApplicationManager appMgr, CyNetworkViewManager netViewMgr,
PreferencesDialogFactoryImpl pdf ) {
+ super("Properties...",appMgr,netViewMgr);
this.desktop = desktop;
this.pdf = pdf;
System.out.println("PreferenceAction()...");
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/PrintAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -49,7 +49,8 @@
import javax.swing.event.MenuEvent;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.presentation.RenderingEngine;
import cytoscape.view.CytoscapeAction;
@@ -65,18 +66,15 @@
*/
public final static String MENU_LABEL = "Print...";
private Properties props;
- private CyNetworkManager cyNetworkMgr;
/**
* Creates a new PrintAction object.
*/
- public PrintAction(CyNetworkManager netmgr, Properties props,
- CyNetworkManager cyNetworkMgr) {
- super(MENU_LABEL, netmgr);
+ public PrintAction(CyApplicationManager appMgr, CyNetworkViewManager
netViewMgr, Properties props ) {
+ super(MENU_LABEL, appMgr, netViewMgr);
setPreferredMenu("File");
setAcceleratorCombo(java.awt.event.KeyEvent.VK_P,
ActionEvent.CTRL_MASK);
this.props = props;
- this.cyNetworkMgr = cyNetworkMgr;
}
/**
@@ -86,7 +84,7 @@
* DOCUMENT ME!
*/
public void actionPerformed(ActionEvent e) {
- RenderingEngine engine =
cyNetworkMgr.getCurrentRenderingEngine();
+ RenderingEngine engine =
applicationManager.getCurrentRenderingEngine();
PrinterJob printJob = PrinterJob.getPrinterJob();
final Set<Object> keys = props.keySet();
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/RedoAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/RedoAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/RedoAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -43,7 +43,8 @@
import javax.swing.event.MenuEvent;
import javax.swing.undo.CannotUndoException;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.undo.UndoSupport;
import cytoscape.view.CytoscapeAction;
@@ -60,8 +61,8 @@
/**
* Constructs the action.
*/
- public RedoAction(UndoSupport undo, CyNetworkManager netmgr) {
- super("Redo",netmgr);
+ public RedoAction(UndoSupport undo, CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr) {
+ super("Redo",appMgr,netViewMgr);
setAcceleratorCombo(KeyEvent.VK_Y, ActionEvent.CTRL_MASK);
setPreferredMenu("Edit");
setEnabled(true);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/UndoAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/UndoAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/UndoAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -43,7 +43,8 @@
import javax.swing.event.MenuEvent;
import javax.swing.undo.CannotUndoException;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.undo.UndoSupport;
import cytoscape.view.CytoscapeAction;
@@ -60,8 +61,8 @@
/**
* Constructs the action.
*/
- public UndoAction(UndoSupport undo,CyNetworkManager netmgr) {
- super("Undo",netmgr);
+ public UndoAction(UndoSupport undo,CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr) {
+ super("Undo",appMgr,netViewMgr);
setAcceleratorCombo(KeyEvent.VK_Z, ActionEvent.CTRL_MASK);
setPreferredMenu("Edit");
setEnabled(true);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -30,7 +30,7 @@
package cytoscape.internal.layout.ui;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.work.TaskManager;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -64,7 +64,7 @@
private CyLayoutAlgorithm layout;
private static final String NOATTRIBUTE = "(none)";
private Set<CyNode> selectedNodes;
- private CyNetworkManager netmgr;
+ private CyApplicationManager appMgr;
private TaskManager tm;
/**
@@ -72,11 +72,11 @@
*
* @param layout DOCUMENT ME!
*/
- public DynamicLayoutMenu(CyLayoutAlgorithm layout, boolean enabled,
CyNetworkManager netmgr, TaskManager tm) {
+ public DynamicLayoutMenu(CyLayoutAlgorithm layout, boolean enabled,
CyApplicationManager appMgr, TaskManager tm) {
super(layout.toString());
addMenuListener(this);
this.layout = layout;
- this.netmgr = netmgr;
+ this.appMgr = appMgr;
this.tm = tm;
selectedNodes = new HashSet<CyNode>();
setEnabled(enabled);
@@ -108,7 +108,7 @@
this.removeAll();
// Base the menu structure only on the current network.
- CyNetwork network = netmgr.getCurrentNetwork();
+ CyNetwork network = appMgr.getCurrentNetwork();
// First, do we support selectedOnly?
selectedNodes = new
HashSet<CyNode>(CyTableUtil.getNodesInState(network,"selected",true));
@@ -124,7 +124,7 @@
addEdgeAttributeMenus(this, network, false);
} else {
// No special menus, so make sure we layout all selected
- List<CyNetworkView> views =
netmgr.getSelectedNetworkViews();
+ List<CyNetworkView> views =
appMgr.getSelectedNetworkViews();
for (final CyNetworkView view: views) {
layout.setSelectedOnly(false);
layout.setLayoutAttribute(null);
@@ -203,7 +203,7 @@
public void actionPerformed(ActionEvent e) {
/*
- List<CyNetworkView> views =
netmgr.getSelectedNetworkViews();
+ List<CyNetworkView> views =
appMgr.getSelectedNetworkViews();
for ( CyNetworkView netView : views ) {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -36,7 +36,7 @@
*/
package cytoscape.internal.layout.ui;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.work.TaskManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyNetwork;
@@ -63,7 +63,7 @@
private final static long serialVersionUID = 1202339874255880L;
List<CyLayoutAlgorithm> subMenuList;
LayoutMenuManager menuMgr;
- private CyNetworkManager netmgr;
+ private CyApplicationManager appMgr;
private TaskManager tm;
/**
@@ -71,12 +71,12 @@
*
* @param menuName DOCUMENT ME!
*/
- public LayoutMenu(String menuName, LayoutMenuManager menuMgr,
CyNetworkManager netmgr,TaskManager tm) {
+ public LayoutMenu(String menuName, LayoutMenuManager menuMgr,
CyApplicationManager appMgr,TaskManager tm) {
super(menuName);
addMenuListener(this);
subMenuList = new ArrayList<CyLayoutAlgorithm>();
this.menuMgr = menuMgr;
- this.netmgr = netmgr;
+ this.appMgr = appMgr;
this.tm = tm;
}
@@ -132,7 +132,7 @@
this.removeAll();
// Figure out if we have anything selected
- CyNetwork network = netmgr.getCurrentNetwork();
+ CyNetwork network = appMgr.getCurrentNetwork();
boolean someSelected = false;
if ( network != null ) {
List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(network,"selected",true);
@@ -148,21 +148,21 @@
if ((layout.supportsNodeAttributes().size() > 0)
|| (layout.supportsEdgeAttributes().size() > 0)) {
- super.add(new
DynamicLayoutMenu(layout,enableMenuItem,netmgr,tm));
+ super.add(new
DynamicLayoutMenu(layout,enableMenuItem,appMgr,tm));
} else if (layout.supportsSelectedOnly() &&
someSelected) {
- super.add(new
DynamicLayoutMenu(layout,enableMenuItem,netmgr,tm));
+ super.add(new
DynamicLayoutMenu(layout,enableMenuItem,appMgr,tm));
} else {
- super.add(new
StaticLayoutMenu(layout,enableMenuItem,netmgr,tm));
+ super.add(new
StaticLayoutMenu(layout,enableMenuItem,appMgr,tm));
}
}
}
private boolean checkEnabled() {
- CyNetwork network = netmgr.getCurrentNetwork();
+ CyNetwork network = appMgr.getCurrentNetwork();
if ( network == null )
return false;
- CyNetworkView view = netmgr.getCurrentNetworkView();
+ CyNetworkView view = appMgr.getCurrentNetworkView();
if ( view == null )
return false;
else
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenuManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenuManager.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenuManager.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -40,7 +40,7 @@
import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.work.TaskManager;
import cytoscape.view.CyMenus;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
import javax.swing.*;
import javax.swing.event.MenuEvent;
@@ -53,17 +53,17 @@
private Map<String, List<CyLayoutAlgorithm>> menuAlgorithmMap;
private Map<String, LayoutMenu> menuMap;
private Set<CyLayoutAlgorithm> existingLayouts;
- private CyNetworkManager netmgr;
+ private CyApplicationManager appMgr;
private TaskManager tm;
private CyLayouts cyLayouts;
- public LayoutMenuManager(CyMenus cyMenus, CyLayouts cyLayouts,
CyNetworkManager netmgr, TaskManager tm) {
+ public LayoutMenuManager(CyMenus cyMenus, CyLayouts cyLayouts,
CyApplicationManager appMgr, TaskManager tm) {
menuAlgorithmMap = new
HashMap<String,List<CyLayoutAlgorithm>>();
menuMap = new HashMap<String,LayoutMenu>();
existingLayouts = new HashSet<CyLayoutAlgorithm>();
this.cyLayouts = cyLayouts;
- this.netmgr = netmgr;
+ this.appMgr = appMgr;
this.tm = tm;
cyMenus.getLayoutMenu().addMenuListener(this);
@@ -127,7 +127,7 @@
// make sure the menu is set up
if ( !menuMap.containsKey(menuName) ) {
- LayoutMenu menu = new LayoutMenu(menuName, this,
netmgr, tm);
+ LayoutMenu menu = new LayoutMenu(menuName, this,
appMgr, tm);
menuMap.put(menuName, menu);
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -30,7 +30,7 @@
package cytoscape.internal.layout.ui;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
import cytoscape.view.CySwingApplication;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayouts;
@@ -71,14 +71,14 @@
private CyLayouts cyLayouts;
private CySwingApplication desktop;
private LayoutMenuManager menuMgr;
- private CyNetworkManager netmgr;
+ private CyApplicationManager appMgr;
private GUITaskManager taskManager;
/**
* Creates a new LayoutSettingsDialog object.
*/
public LayoutSettingsDialog(final CyLayouts cyLayouts, final
CySwingApplication desktop,
- final LayoutMenuManager menuMgr, final
CyNetworkManager netmgr,
+ final LayoutMenuManager menuMgr, final
CyApplicationManager appMgr,
final GUITaskManager taskManager)
{
super(desktop.getJFrame(), "Layout Settings", false);
@@ -86,7 +86,7 @@
this.cyLayouts = cyLayouts;
this.desktop = desktop;
this.menuMgr = menuMgr;
- this.netmgr = netmgr;
+ this.appMgr = appMgr;
this.taskManager = taskManager;
}
@@ -103,7 +103,7 @@
setVisible(false);
else if (command.equals("execute")) {
taskManager.setParent(algorithmPanel);
-
currentLayout.setNetworkView(netmgr.getCurrentNetworkView());
+
currentLayout.setNetworkView(appMgr.getCurrentNetworkView());
taskManager.execute(currentLayout);
} else {
// OK, initialize and display
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/SettingsAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/SettingsAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/SettingsAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -30,7 +30,8 @@
package cytoscape.internal.layout.ui;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import cytoscape.view.CytoscapeAction;
import cytoscape.view.CySwingApplication;
import org.cytoscape.view.layout.CyLayouts;
@@ -48,10 +49,9 @@
private LayoutMenuManager menuMgr;
private GUITaskManager tm;
- public SettingsAction(final CyLayouts cyl, final CySwingApplication
desk, final LayoutMenuManager menuMgr,
- final CyNetworkManager netmgr, final
GUITaskManager tm)
+ public SettingsAction(final CyLayouts cyl, final CySwingApplication
desk, final LayoutMenuManager menuMgr, final CyApplicationManager appMgr, final
CyNetworkViewManager netViewMgr, final GUITaskManager tm)
{
- super("Settings...",netmgr);
+ super("Settings...",appMgr,netViewMgr);
setPreferredMenu("Layout");
this.cyl = cyl;
this.desk = desk;
@@ -60,7 +60,7 @@
}
public void actionPerformed(ActionEvent e) {
- LayoutSettingsDialog settingsDialog = new
LayoutSettingsDialog(cyl, desk, menuMgr, netmgr, tm);
+ LayoutSettingsDialog settingsDialog = new
LayoutSettingsDialog(cyl, desk, menuMgr, applicationManager, tm);
settingsDialog.actionPerformed(e);
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -12,8 +12,8 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.events.RowSetMicroListener;
import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.session.events.NetworkViewAddedEvent;
-import org.cytoscape.session.events.NetworkViewAddedListener;
+import org.cytoscape.view.model.events.NetworkViewAddedEvent;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -46,7 +46,8 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TunableValidator;
import org.cytoscape.work.swing.GUITaskManager;
@@ -102,11 +103,14 @@
private CytoPanel cytoPanel;
final private static Logger logger =
LoggerFactory.getLogger(CytoPanelTaskFactoryTunableAction.class);
- public CytoPanelTaskFactoryTunableAction(final TaskFactory factory,
final GUITaskManager manager,
+ public CytoPanelTaskFactoryTunableAction(final TaskFactory factory,
+ final GUITaskManager manager,
final CySwingApplication app,
- final Map serviceProps, final
CyNetworkManager netmgr)
+ final Map serviceProps,
+ final CyApplicationManager
appMgr,
+ final CyNetworkViewManager
netViewMgr)
{
- super(serviceProps, netmgr);
+ super(serviceProps, appMgr, netViewMgr);
this.factory = factory;
this.manager = manager;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkCollectionTaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkCollectionTaskFactoryTunableAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkCollectionTaskFactoryTunableAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -36,7 +36,8 @@
import org.cytoscape.work.TaskManager;
import cytoscape.view.CytoscapeAction;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.task.NetworkCollectionTaskFactory;
@@ -45,13 +46,13 @@
public NetworkCollectionTaskFactoryTunableAction(TaskManager manager,
NetworkCollectionTaskFactory factory,
- Map serviceProps,
CyNetworkManager netmgr)
- {
- super(manager, factory, serviceProps, netmgr);
+ Map serviceProps,
CyApplicationManager appMgr,
+
CyNetworkViewManager netViewMgr) {
+ super(manager, factory, serviceProps, appMgr, netViewMgr);
}
public void actionPerformed(ActionEvent a) {
- factory.setNetworkCollection( netmgr.getSelectedNetworks() );
+ factory.setNetworkCollection(
applicationManager.getSelectedNetworks() );
super.actionPerformed(a);
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewCollectionTaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewCollectionTaskFactoryTunableAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewCollectionTaskFactoryTunableAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -37,7 +37,7 @@
import cytoscape.view.CytoscapeAction;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.session.CyAppliactionManager;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.task.NetworkViewCollectionTaskFactory;
@@ -46,7 +46,7 @@
public NetworkViewCollectionTaskFactoryTunableAction(TaskManager
manager,
NetworkViewCollectionTaskFactory factory, Map serviceProps,
- final
CyAppliactionManager applicationManager,
+ final
CyApplicationManager applicationManager,
final
CyNetworkViewManager networkViewManager)
{
super(manager, factory, serviceProps, applicationManager,
networkViewManager);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewTaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewTaskFactoryTunableAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/NetworkViewTaskFactoryTunableAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -38,7 +38,7 @@
import org.cytoscape.work.TaskManager;
import cytoscape.view.CytoscapeAction;
-import org.cytoscape.view.manager.CyNetworkViewManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.task.NetworkViewTaskFactory;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -39,7 +39,7 @@
import cytoscape.view.CytoscapeAction;
import org.cytoscape.view.model.CyNetworkViewManager;
-import org.cytoscape.session.CyAppliactionManager;
+import org.cytoscape.session.CyApplicationManager;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
@@ -52,7 +52,8 @@
public TaskFactoryTunableAction(final TaskManager manager, final T
factory,
final Map serviceProps,
- final CyAppliactionManager
applicationManager, final CyNetworkViewManager networkViewManager)
+ final CyApplicationManager
applicationManager,
+ final CyNetworkViewManager
networkViewManager)
{
super(serviceProps, applicationManager, networkViewManager);
this.manager = manager;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/BirdsEyeViewHandler.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -51,14 +51,15 @@
import javax.swing.JPanel;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyNetworkManager;
-import org.cytoscape.session.events.NetworkViewDestroyedEvent;
-import org.cytoscape.session.events.NetworkViewDestroyedListener;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SetCurrentNetworkEvent;
import org.cytoscape.session.events.SetCurrentNetworkListener;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.events.NetworkViewDestroyedEvent;
+import org.cytoscape.view.model.events.NetworkViewDestroyedListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
import org.slf4j.Logger;
@@ -81,7 +82,8 @@
FrameListener frameListener = new FrameListener();
final NetworkViewManager viewmgr;
- final CyNetworkManager netmgr;
+ final CyApplicationManager appMgr;
+ final CyNetworkViewManager netViewMgr;
final Container bevPanel;
@@ -92,10 +94,11 @@
* The JDesktopPane of the NetworkViewManager. Can be null.
*/
public BirdsEyeViewHandler(final NetworkViewManager viewmgr,
- final CyNetworkManager netmgr,
+ final CyApplicationManager appMgr, CyNetworkViewManager
netViewMgr,
RenderingEngineFactory<CyNetwork> defaultFactory) {
this.viewmgr = viewmgr;
- this.netmgr = netmgr;
+ this.appMgr = appMgr;
+ this.netViewMgr = netViewMgr;
final JDesktopPane desktopPane = viewmgr.getDesktopPane();
bevPanel = new JPanel();
@@ -126,10 +129,10 @@
+ network.getSUID());
bevPanel.removeAll();
-// final CyNetworkView view =
netmgr.getNetworkView(network.getSUID());
+// final CyNetworkView view =
netViewMgr.getNetworkView(network.getSUID());
// if(view != null) {
// RenderingEngine<CyNetwork> engine =
bevFactory.render(bevPanel,
-//
netmgr.getNetworkView(network.getSUID()));
+//
netViewMgr.getNetworkView(network.getSUID()));
// setFocus();
// } else {
// logger.warn("######### NO View exists for network = "
@@ -158,7 +161,7 @@
// // Cleanup the visualization container
// bevPanel.removeAll();
// RenderingEngine<CyNetwork> engine = bevFactory.render(bevPanel,
-// netmgr.getCurrentNetworkView());
+// appMgr.getCurrentNetworkView());
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/CytoscapeMenuPopulator.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/CytoscapeMenuPopulator.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/CytoscapeMenuPopulator.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -34,7 +34,8 @@
import cytoscape.view.CyMenuBar;
import cytoscape.view.CyToolBar;
-import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
import cytoscape.internal.task.CytoPanelTaskFactoryTunableAction;
import cytoscape.internal.task.TaskFactoryTunableAction;
@@ -70,7 +71,8 @@
final private CySwingApplication app;
final private CyMenus cyMenus;
final private GUITaskManager taskManager;
- final private CyNetworkManager netManager;
+ final private CyNetworkViewManager netViewManager;
+ final private CyApplicationManager appManager;
final private Map<TaskFactory, CyAction> taskMap;
@@ -80,21 +82,22 @@
* but won't fill them with menu items and associated action listeners.
*/
public CytoscapeMenuPopulator(final CySwingApplication app, final
GUITaskManager taskManager,
- final CyNetworkManager netManager)
+ final CyApplicationManager appManager,
final CyNetworkViewManager netViewManager)
{
this.app = app;
this.cyMenus = app.getCyMenus();
this.taskManager = taskManager;
- this.netManager = netManager;
+ this.appManager = appManager;
+ this.netViewManager = netViewManager;
taskMap = new HashMap<TaskFactory,CyAction>();
}
public void addTaskFactory(TaskFactory factory, Map props) {
if (taskManager.hasTunables(factory))
- addFactory(new
CytoPanelTaskFactoryTunableAction(factory, taskManager, app, props,
netManager), factory, props);
+ addFactory(new
CytoPanelTaskFactoryTunableAction(factory, taskManager, app, props, appManager,
netViewManager), factory, props);
else
- addFactory(new
TaskFactoryTunableAction<TaskFactory>(taskManager, factory, props, netManager),
factory, props);
+ addFactory(new
TaskFactoryTunableAction<TaskFactory>(taskManager, factory, props, appManager,
netViewManager), factory, props);
}
public void removeTaskFactory(TaskFactory factory, Map props) {
@@ -102,7 +105,7 @@
}
public void addNetworkTaskFactory(NetworkTaskFactory factory, Map
props) {
- addFactory(new NetworkTaskFactoryTunableAction(taskManager,
factory, props, netManager), factory, props);
+ addFactory(new NetworkTaskFactoryTunableAction(taskManager,
factory, props, appManager, netViewManager), factory, props);
}
public void removeNetworkTaskFactory(NetworkTaskFactory factory, Map
props) {
@@ -110,7 +113,7 @@
}
public void addNetworkViewTaskFactory(NetworkViewTaskFactory factory,
Map props) {
- addFactory(new NetworkViewTaskFactoryTunableAction(taskManager,
factory, props, netManager), factory, props);
+ addFactory(new NetworkViewTaskFactoryTunableAction(taskManager,
factory, props, appManager, netViewManager), factory, props);
}
public void removeNetworkViewTaskFactory(NetworkViewTaskFactory
factory, Map props) {
@@ -118,7 +121,7 @@
}
public void
addNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory factory,
Map props) {
- addFactory(new
NetworkViewCollectionTaskFactoryTunableAction(taskManager, factory, props,
netManager), factory, props);
+ addFactory(new
NetworkViewCollectionTaskFactoryTunableAction(taskManager, factory, props,
appManager, netViewManager), factory, props);
}
public void
removeNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory
factory, Map props) {
@@ -126,7 +129,7 @@
}
public void
addNetworkCollectionTaskFactory(NetworkCollectionTaskFactory factory, Map
props) {
- addFactory(new
NetworkCollectionTaskFactoryTunableAction(taskManager, factory, props,
netManager), factory, props);
+ addFactory(new
NetworkCollectionTaskFactoryTunableAction(taskManager, factory, props,
appManager, netViewManager), factory, props);
}
public void
removeNetworkCollectionTaskFactory(NetworkCollectionTaskFactory factory, Map
props) {
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 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -224,7 +224,7 @@
}
public void addTaskFactory(TaskFactory factory, Map props) {
- addFactory(factory, new TaskFactoryTunableAction(taskManager,
factory, props, netmgr));
+ addFactory(factory, new TaskFactoryTunableAction(taskManager,
factory, props, applicationManager,networkViewManager));
}
public void removeTaskFactory(TaskFactory factory, Map props) {
@@ -232,7 +232,7 @@
}
public void
addNetworkCollectionTaskFactory(NetworkCollectionTaskFactory factory, Map
props) {
- addFactory(factory,new
NetworkCollectionTaskFactoryTunableAction(taskManager, factory, props, netmgr));
+ addFactory(factory,new
NetworkCollectionTaskFactoryTunableAction(taskManager, factory, props,
applicationManager,networkViewManager));
}
public void
removeNetworkCollectionTaskFactory(NetworkCollectionTaskFactory factory, Map
props) {
@@ -241,7 +241,7 @@
public void
addNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory factory,
Map props) {
- addFactory(factory, new
NetworkViewCollectionTaskFactoryTunableAction(taskManager, factory, props,
netmgr));
+ addFactory(factory, new
NetworkViewCollectionTaskFactoryTunableAction(taskManager, factory, props,
applicationManager,networkViewManager));
}
public void
removeNetworkViewCollectionTaskFactory(NetworkViewCollectionTaskFactory
factory, Map props) {
@@ -249,7 +249,7 @@
}
public void addNetworkTaskFactory(NetworkTaskFactory factory, Map
props) {
- addFactory(factory, new
NetworkTaskFactoryTunableAction(taskManager, factory, props, netmgr));
+ addFactory(factory, new
NetworkTaskFactoryTunableAction(taskManager, factory, props,
applicationManager,networkViewManager));
}
public void removeNetworkTaskFactory(NetworkTaskFactory factory, Map
props) {
@@ -257,7 +257,7 @@
}
public void addNetworkViewTaskFactory(NetworkViewTaskFactory factory,
Map props) {
- addFactory(factory, new
NetworkViewTaskFactoryTunableAction(taskManager, factory, props, netmgr));
+ addFactory(factory, new
NetworkViewTaskFactoryTunableAction(taskManager, factory, props,
applicationManager,networkViewManager));
}
public void removeNetworkViewTaskFactory(NetworkViewTaskFactory
factory, Map props) {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -51,16 +51,17 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.RowSetMicroListener;
-import org.cytoscape.session.CyNetworkManager;
-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.session.CyApplicationManager;
+import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedEvent;
+import org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener;
import org.cytoscape.session.events.SetCurrentNetworkEvent;
import org.cytoscape.session.events.SetCurrentNetworkListener;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.events.NetworkViewAddedEvent;
+import org.cytoscape.view.model.events.NetworkViewAddedListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
@@ -108,7 +109,8 @@
private final Map<CyNetwork,RowSetMicroListener> nameListeners;
private final CyEventHelper eventHelper;
- private final CyNetworkManager networkManager;
+ private final CyNetworkViewManager networkViewManager;
+ private final CyApplicationManager applicationManager;
/**
@@ -117,11 +119,12 @@
* @param desktop
* DOCUMENT ME!
*/
- public NetworkViewManager(CyNetworkManager netmgr, Properties props,
+ public NetworkViewManager(CyApplicationManager appMgr,
CyNetworkViewManager netViewMgr, Properties props,
CyHelpBroker help, CyEventHelper eventHelper) {
this.factories = new HashMap<String,
RenderingEngineFactory<CyNetwork>>();
- this.networkManager = netmgr;
+ this.networkViewManager = netViewMgr;
+ this.applicationManager = appMgr;
this.props = props;
this.eventHelper = eventHelper;
desktopPane = new JDesktopPane();
@@ -221,7 +224,7 @@
if (network_id == null)
return;
- networkManager.setCurrentNetworkView(network_id);
+ applicationManager.setCurrentNetworkView(network_id);
}
/**
@@ -297,7 +300,7 @@
return;
}
- final CyNetworkView targetViewModel =
networkManager.getNetworkView(networkModelID);
+ final CyNetworkView targetViewModel =
networkViewManager.getNetworkView(networkModelID);
if(targetViewModel == null) {
logger.debug("View model does not exist for model ID: "
+ networkModelID);
return;
@@ -385,7 +388,7 @@
.getVisualProperty(NETWORK_TITLE), true, true,
true, true);
iframe.addInternalFrameListener(new InternalFrameAdapter() {
public void internalFrameClosing(InternalFrameEvent e) {
- networkManager.destroyNetworkView(view);
+ networkViewManager.destroyNetworkView(view);
}
});
desktopPane.add(iframe);
@@ -447,7 +450,7 @@
componentMap.put(iframe, view.getModel().getSUID());
Long sourceNetwork = view.getModel().getSUID();
-
networkManager.setCurrentRenderingEngine(presentationMap.get(sourceNetwork));
+
applicationManager.setCurrentRenderingEngine(presentationMap.get(sourceNetwork));
updateNetworkTitle( view.getModel() );
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpAboutTask.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpAboutTask.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpAboutTask.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -32,7 +32,6 @@
import org.cytoscape.splash.CreditScreen;
-import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -47,8 +46,4 @@
public void run(TaskMonitor tm) {
credits.showCredits();
}
-
- @Override
- public void cancel() {
- }
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpContentsTask.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpContentsTask.java
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/help/HelpContentsTask.java
2010-10-28 18:07:41 UTC (rev 22548)
@@ -30,7 +30,6 @@
package cytoscape.internal.view.help;
-import org.cytoscape.session.CyNetworkManager;
import cytoscape.view.CyHelpBroker;
import cytoscape.view.CySwingApplication;
import org.cytoscape.work.AbstractTask;
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 18:07:41 UTC (rev 22548)
@@ -7,6 +7,12 @@
<!-- Import OSGi services -->
+ <osgi:reference id="cyApplicationManagerServiceRef"
+ interface="org.cytoscape.session.CyApplicationManager" />
+
+ <osgi:reference id="cyNetworkViewManagerServiceRef"
+ interface="org.cytoscape.view.model.CyNetworkViewManager" />
+
<osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
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 18:05:42 UTC (rev 22547)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 18:07:41 UTC (rev 22548)
@@ -69,7 +69,8 @@
</bean>
<bean name="networkViewManager"
class="cytoscape.internal.view.NetworkViewManager">
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="cytoscapeProperties" />
<constructor-arg ref="cyHelpBroker" />
<constructor-arg ref="cyEventHelperServiceRef" />
@@ -77,7 +78,8 @@
<bean name="birdsEyeViewHandler"
class="cytoscape.internal.view.BirdsEyeViewHandler">
<constructor-arg ref="networkViewManager" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg
ref="dingNavigationPresentationFactoryServiceRef" />
</bean>
@@ -113,16 +115,19 @@
</bean>
-->
<bean id="exitAction" class="cytoscape.internal.actions.ExitAction">
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="cytoscapeShutdown" />
</bean>
<bean id="undoAction" class="cytoscape.internal.actions.UndoAction">
<constructor-arg ref="undoSupportServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
</bean>
<bean id="redoAction" class="cytoscape.internal.actions.RedoAction">
<constructor-arg ref="undoSupportServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
</bean>
<bean id="deleteAction" class="cytoscape.internal.actions.DeleteAction">
<constructor-arg ref="undoSupportServiceRef" />
@@ -132,12 +137,14 @@
</bean>
<bean id="preferenceAction"
class="cytoscape.internal.actions.PreferenceAction">
<constructor-arg ref="cytoscapeDesktop" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="preferencesDialogFactory" />
</bean>
<bean id="bookmarkAction"
class="cytoscape.internal.actions.BookmarkAction">
<constructor-arg ref="cytoscapeDesktop" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="bookmarkDialogFactory" />
</bean>
<!--
@@ -167,7 +174,8 @@
<bean name="cytoscapeMenuPopulator"
class="cytoscape.internal.view.CytoscapeMenuPopulator">
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="guiTaskManagerServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
</bean>
<bean id="settingsAction"
class="cytoscape.internal.layout.ui.SettingsAction">
--
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.
