Author: kono
Date: 2010-08-09 17:21:16 -0700 (Mon, 09 Aug 2010)
New Revision: 21276
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.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/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Method name changed from getSource() to getModel() for consistency.
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-08-10 00:21:16 UTC (rev 21276)
@@ -106,7 +106,7 @@
CyNetworkView myView = netmgr.getCurrentNetworkView();
// delete from the base CySubNetwork so that our changes can be
undone
- CySubNetwork cyNet = cyRootNetworkFactory.convert(
myView.getSource() ).getBaseNetwork();
+ CySubNetwork cyNet = cyRootNetworkFactory.convert(
myView.getModel() ).getBaseNetwork();
List<CyEdge> selEdges =
CyDataTableUtil.getEdgesInState(cyNet,"selected",true);
List<CyNode> selNodes =
CyDataTableUtil.getNodesInState(cyNet,"selected",true);
CyNode cyNode;
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-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-08-10 00:21:16 UTC (rev 21276)
@@ -216,7 +216,7 @@
if (selectedOnly &&
(selectedNodes.size() > 0)) {
// Lock all unselected nodes
for ( View<CyNode> nv :
netView.getNodeViews() ) {
- CyNode node =
nv.getSource();
+ CyNode node =
nv.getModel();
if
(!selectedNodes.contains(node))
layout.lockNode(nv);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-08-10 00:21:16 UTC (rev 21276)
@@ -15,9 +15,9 @@
CyNetworkView view = e.getNetworkView();
for ( View<CyNode> nv : view.getNodeViews() )
- nv.getSource().attrs().addRowListener( new
SelectNodeViewUpdater(nv) );
+ nv.getModel().attrs().addRowListener( new
SelectNodeViewUpdater(nv) );
for ( View<CyEdge> ev : view.getEdgeViews() )
- ev.getSource().attrs().addRowListener( new
SelectEdgeViewUpdater(ev) );
+ ev.getModel().attrs().addRowListener( new
SelectEdgeViewUpdater(ev) );
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-08-10 00:21:16 UTC (rev 21276)
@@ -359,8 +359,8 @@
public void handleEvent(SetCurrentNetworkViewEvent e) {
System.out.println("NetworkPanel: set current network view "
- + e.getNetworkView().getSource().getSUID());
- long curr = e.getNetworkView().getSource().getSUID();
+ + e.getNetworkView().getModel().getSUID());
+ long curr = e.getNetworkView().getModel().getSUID();
// System.out.println("NetworkPanel setting current network
view: " +
// curr);
if (currentNetId == null || curr != currentNetId.longValue())
@@ -379,13 +379,13 @@
public void handleEvent(NetworkViewAboutToBeDestroyedEvent nde) {
System.out.println("NetworkPanel: network view about to be
destroyed "
- + nde.getNetworkView().getSource().getSUID());
+ + nde.getNetworkView().getModel().getSUID());
treeTable.getTree().updateUI();
}
public void handleEvent(NetworkViewAddedEvent nde) {
System.out.println("NetworkPanel: network view added "
- + nde.getNetworkView().getSource().getSUID());
+ + nde.getNetworkView().getModel().getSUID());
treeTable.getTree().updateUI();
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2010-08-10 00:21:16 UTC (rev 21276)
@@ -45,7 +45,6 @@
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
-import javax.swing.Renderer;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
@@ -62,8 +61,8 @@
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.RenderingEngineFactory;
-import org.cytoscape.view.presentation.RenderingEngine;
import cytoscape.view.CyHelpBroker;
@@ -105,6 +104,7 @@
private Map<CyNetwork,CyRowListener> nameListeners;
+
/**
* Creates a new NetworkViewManager object.
*
@@ -131,31 +131,31 @@
nameListeners = new HashMap<CyNetwork,CyRowListener>();
}
+
/**
- * Dynamically adding presentation factory.
- * This is necessary to support multiple presentations.
+ * Dynamically adding rendering engine factory.
*
- *
* @param factory
* @param props
*/
- public void addPresentationFactory(RenderingEngineFactory factory, Map
props) {
+ public void addPresentationFactory(RenderingEngineFactory<CyNetwork>
factory, Map props) {
System.out.print("\n\n\n Adding New Rendering Engine
>>>>>>>>>>");
Object rendererID = props.get(ID);
- if(rendererID == null) {
+ if(rendererID == null)
throw new IllegalArgumentException("Renderer ID is
null.");
- }
factories.put(rendererID.toString(), factory);
if(currentRenderingEngineFactory == null &&
rendererID.equals(DEFAULT_PRESENTATION)) {
currentRenderingEngineFactory = factory;
+ System.out.print(rendererID + " is registered as
default rendering engine.");
}
System.out.println(">>>> New Rendering Engine is Available: " +
rendererID +"\n\n\n");
}
- public void removePresentationFactory(RenderingEngineFactory factory,
Map props) {
+
+ public void removePresentationFactory(RenderingEngineFactory<CyNetwork>
factory, Map props) {
factories.remove(props.get(ID));
}
@@ -186,9 +186,10 @@
}
// outta here
- return networkViewMap.get(view.getSource().getSUID());
+ return networkViewMap.get(view.getModel().getSUID());
}
+
/**
* DOCUMENT ME!
*
@@ -271,15 +272,16 @@
public void handleEvent(SetCurrentNetworkViewEvent e) {
System.out
- .println("NetworkViewManager - attempting to
set current network view ");
+ .println("\n\n\n############ NetworkViewManager
- attempting to set current network view ");
- Long sourceNetwork = e.getNetworkView().getSource().getSUID();
+ Long sourceNetwork = e.getNetworkView().getModel().getSUID();
setFocus(sourceNetwork);
}
+
public void handleEvent(SetCurrentNetworkEvent e) {
System.out
- .println("NetworkViewManager - attempting to
set current network");
+ .println("\n\n\n############ NetworkViewManager
- attempting to set current network");
Long sourceNetwork = e.getNetwork().getSUID();
setFocus(sourceNetwork);
@@ -329,34 +331,34 @@
}
}
+
public void handleEvent(NetworkViewAboutToBeDestroyedEvent nvde) {
System.out.println("NetworkViewManager - network view destroyed
");
removeView(nvde.getNetworkView());
}
public void handleEvent(NetworkViewAddedEvent nvae) {
- System.out.println("NetworkViewManager - network view added: "
- + nvae.getNetworkView().getSource().getSUID());
+ System.out.println("\n\n############### Creating view:
NetworkViewManager - network view added: "
+ + nvae.getNetworkView().getModel().getSUID());
createContainer(nvae.getNetworkView());
-
}
protected void removeView(CyNetworkView view) {
try {
-
networkViewMap.get(view.getSource().getSUID()).dispose();
+ networkViewMap.get(view.getModel().getSUID()).dispose();
} catch (Exception e) {
System.err.println("Network View unable to be killed");
}
- networkViewMap.remove(view.getSource().getSUID());
- nameListeners.remove(view.getSource());
+ networkViewMap.remove(view.getModel().getSUID());
+ nameListeners.remove(view.getModel());
}
/**
* Contains a CyNetworkView.
*/
protected void createContainer(final CyNetworkView view) {
- if (networkViewMap.containsKey(view.getSource().getSUID())) {
+ if (networkViewMap.containsKey(view.getModel().getSUID())) {
// already contains
return;
}
@@ -373,7 +375,7 @@
desktopPane.add(iframe);
// iframe.setContentPane(
view.getContainer(iframe.getLayeredPane()) );
- this.presentationMap.put(view.getSource().getSUID(),
this.currentRenderingEngineFactory.render(iframe, view));
+ this.presentationMap.put(view.getModel().getSUID(),
this.currentRenderingEngineFactory.render(iframe, view));
iframe.pack();
@@ -420,16 +422,16 @@
iframe.setVisible(true);
iframe.addInternalFrameListener(this);
- networkViewMap.put(view.getSource().getSUID(), iframe);
- componentMap.put(iframe, view.getSource().getSUID());
+ networkViewMap.put(view.getModel().getSUID(), iframe);
+ componentMap.put(iframe, view.getModel().getSUID());
- Long sourceNetwork = view.getSource().getSUID();
+ Long sourceNetwork = view.getModel().getSUID();
netmgr.setCurrentNetworkView(sourceNetwork);
netmgr.setCurrentPresentation(presentationMap.get(sourceNetwork));
- updateNetworkTitle( view.getSource() );
+ updateNetworkTitle( view.getModel() );
- nameListeners.put(view.getSource(), new
NetworkNameListener(view.getSource()) );
+ nameListeners.put(view.getModel(), new
NetworkNameListener(view.getModel()) );
}
private class NetworkNameListener implements CyRowListener {
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-08-10 00:20:47 UTC (rev 21275)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-08-10 00:21:16 UTC (rev 21276)
@@ -9,18 +9,21 @@
<osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.session.CyNetworkManager" />
+
<osgi:reference id="cyNetworkNamingServiceRef"
interface="org.cytoscape.session.CyNetworkNaming" />
+
<osgi:reference id="streamUtilServiceRef"
interface="org.cytoscape.io.util.StreamUtil" />
<osgi:reference id="taskManagerServiceRef"
interface="org.cytoscape.work.TaskManager" />
- <!-- <osgi:reference id="presentationManagerServiceRef"
interface="org.cytoscape.view.presentation.PresentationManager"
- /> -->
+
+ <!-- Rendering Engine factory for main network views -->
<osgi:reference id="dingPresentationFactoryServiceRef"
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
filter="(id=ding)" />
+ <!-- Rendering Engine factory for navigation views -->
<osgi:reference id="dingNavigationPresentationFactoryServiceRef"
interface="org.cytoscape.view.presentation.RenderingEngineFactory"
filter="(id=dingNavigation)" />
--
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.
