Author: kono
Date: 2009-11-23 15:33:14 -0800 (Mon, 23 Nov 2009)
New Revision: 18549
Modified:
cytoscape/trunk/src/cytoscape/CyNode.java
cytoscape/trunk/src/cytoscape/CytoscapeInit.java
cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
Log:
Initialization code for NestedNetworkImagemanager had been added in
CytoscapeInit
Modified: cytoscape/trunk/src/cytoscape/CyNode.java
===================================================================
--- cytoscape/trunk/src/cytoscape/CyNode.java 2009-11-23 22:05:50 UTC (rev
18548)
+++ cytoscape/trunk/src/cytoscape/CyNode.java 2009-11-23 23:33:14 UTC (rev
18549)
@@ -281,7 +281,6 @@
Cytoscape.getPropertyChangeSupport().firePropertyChange(Cytoscape.NESTED_NETWORK_DESTROYED,
this, null);
} else {
Cytoscape.getPropertyChangeSupport().firePropertyChange(Cytoscape.NESTED_NETWORK_CREATED,
this, graphPerspective);
-
}
}
Modified: cytoscape/trunk/src/cytoscape/CytoscapeInit.java
===================================================================
--- cytoscape/trunk/src/cytoscape/CytoscapeInit.java 2009-11-23 22:05:50 UTC
(rev 18548)
+++ cytoscape/trunk/src/cytoscape/CytoscapeInit.java 2009-11-23 23:33:14 UTC
(rev 18549)
@@ -49,6 +49,7 @@
import cytoscape.plugin.PluginManager;
import cytoscape.util.FileUtil;
+import cytoscape.util.NestedNetworkImageManager;
import cytoscape.util.shadegrown.WindowUtilities;
@@ -159,6 +160,9 @@
// Build the OntologyServer.
Cytoscape.buildOntologyServer();
+
+ // Instantiate Nested Network Image Manager singleton
+ NestedNetworkImageManager.getNetworkImageGenerator();
// get the manager so it can test for webstart before
menus are
// created (little hacky)
@@ -307,7 +311,7 @@
long endtime = System.currentTimeMillis() - begintime;
logger.info("Cytoscape initialized successfully in: " + endtime
+ " ms");
Cytoscape.firePropertyChange(Cytoscape.CYTOSCAPE_INITIALIZED,
null, null);
-
+
return true;
}
Modified: cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
2009-11-23 22:05:50 UTC (rev 18548)
+++ cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
2009-11-23 23:33:14 UTC (rev 18549)
@@ -9,6 +9,7 @@
import javax.swing.ImageIcon;
import cytoscape.CyNetwork;
+import cytoscape.CyNode;
import cytoscape.Cytoscape;
import cytoscape.view.CyNetworkView;
import ding.view.DGraphView;
@@ -46,7 +47,7 @@
return this.networkToImageMap.size();
}
- public void propertyChange(final PropertyChangeEvent evt) {
+ public void propertyChange(final PropertyChangeEvent evt) {
if
(evt.getPropertyName().equals(Cytoscape.NESTED_NETWORK_CREATED)) {
final CyNetwork network = (CyNetwork) evt.getNewValue();
if (this.networkToImageMap.containsKey(network)) {
@@ -74,7 +75,11 @@
}
}
+ private void addCustomGraphics(final CyNetwork network, final CyNode
parentNode) {
+
+ }
+
static class ImageAndReferenceCount {
private Image image;
private int refCount;
Modified:
cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
===================================================================
--- cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
2009-11-23 22:05:50 UTC (rev 18548)
+++ cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
2009-11-23 23:33:14 UTC (rev 18549)
@@ -1,5 +1,6 @@
package cytoscape.util;
+import cytoscape.Cytoscape;
import cytoscape.data.readers.NNFReader;
import junit.framework.TestCase;
@@ -9,6 +10,8 @@
protected void setUp() throws Exception {
super.setUp();
+ // Instantiate Nested Network Image Manager singleton
+ NestedNetworkImageManager.getNetworkImageGenerator();
}
protected void tearDown() throws Exception {
@@ -16,14 +19,18 @@
}
public void testNestedNetworkImageManager() throws Exception {
+ TestUtil.destroyNetworksEdgesAndNodes();
// Load nested network
- TestUtil.destroyNetworksEdgesAndNodes();
-
final NNFReader reader = new NNFReader(FILE_LOCATION +
"good3.nnf");
reader.read();
+ assertNotNull(Cytoscape.getCyNode("M1"));
+ assertNotNull(Cytoscape.getCyNode("M2"));
+ assertNotNull(Cytoscape.getCyNode("M3"));
assertEquals(3,
NestedNetworkImageManager.getNetworkImageGenerator().getImageCount());
+ TestUtil.destroyNetworksEdgesAndNodes();
+ assertEquals(0,
NestedNetworkImageManager.getNetworkImageGenerator().getImageCount());
}
}
--
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=.
