Author: kono
Date: 2009-12-01 17:37:44 -0800 (Tue, 01 Dec 2009)
New Revision: 18641
Modified:
cytoscape/trunk/lib/ding.jar
cytoscape/trunk/src/cytoscape/Cytoscape.java
cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
Log:
Null value checker added for non-nested networks.
Modified: cytoscape/trunk/lib/ding.jar
===================================================================
(Binary files differ)
Modified: cytoscape/trunk/src/cytoscape/Cytoscape.java
===================================================================
--- cytoscape/trunk/src/cytoscape/Cytoscape.java 2009-12-02 00:58:48 UTC
(rev 18640)
+++ cytoscape/trunk/src/cytoscape/Cytoscape.java 2009-12-02 01:37:44 UTC
(rev 18641)
@@ -1702,9 +1702,7 @@
* @param vs the VisualStyle in which to render this new network. If
null,
* the default visual style will be used.
*/
- public static CyNetworkView createNetworkView(CyNetwork network, String
title, CyLayoutAlgorithm layout, VisualStyle vs) {
- Thread.dumpStack();
-
+ public static CyNetworkView createNetworkView(CyNetwork network, String
title, CyLayoutAlgorithm layout, VisualStyle vs) {
if (network == nullNetwork) {
return nullNetworkView;
}
@@ -1714,14 +1712,6 @@
}
final DingNetworkView view = new DingNetworkView(network,
title);
-// for (final NodeView nv:
(List<NodeView>)view.getNodeViewsList()) {
-// final GraphPerspective nestedNetwork =
nv.getNode().getNestedNetwork();
-// if (nestedNetwork != null) {
-// final CyNetworkView nestedNetworkView =
Cytoscape.getNetworkView(((CyNetwork)nestedNetwork).getIdentifier());
-// if
(!nestedNetworkView.equals(Cytoscape.getNullNetworkView()))
-//
((DNodeView)nv).setNestedNetworkView((DGraphView) nestedNetworkView);
-// }
-// }
view.setGraphLOD(new CyGraphLOD());
view.setIdentifier(network.getIdentifier());
Modified: cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2009-12-02 00:58:48 UTC (rev 18640)
+++ cytoscape/trunk/src/cytoscape/util/NestedNetworkViewUpdater.java
2009-12-02 01:37:44 UTC (rev 18641)
@@ -22,10 +22,12 @@
public class NestedNetworkViewUpdater implements PropertyChangeListener {
public NestedNetworkViewUpdater() {
+
//Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(this);
Cytoscape.getSwingPropertyChangeSupport().addPropertyChangeListener(this);
}
- public void propertyChange(final PropertyChangeEvent evt) {
+ public void propertyChange(final PropertyChangeEvent evt) {
+ //System.out.println("------- Got Signal --------> " +
evt.getPropertyName() + ", " + evt.getSource());
if
(evt.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEW_CREATED) ||
evt.getPropertyName().equals(CytoscapeDesktop.NETWORK_VIEW_DESTROYED)) {
--
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.
