Author: ruschein
Date: 2009-11-24 15:36:43 -0800 (Tue, 24 Nov 2009)
New Revision: 18574
Modified:
cytoscape/trunk/src/cytoscape/CytoscapeInit.java
cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
Log:
Made the singleton nature of NestedNetworkImageManager more explicit and hid
additional member functions.
Modified: cytoscape/trunk/src/cytoscape/CytoscapeInit.java
===================================================================
--- cytoscape/trunk/src/cytoscape/CytoscapeInit.java 2009-11-24 23:49:03 UTC
(rev 18573)
+++ cytoscape/trunk/src/cytoscape/CytoscapeInit.java 2009-11-24 23:36:43 UTC
(rev 18574)
@@ -160,10 +160,9 @@
// Build the OntologyServer.
Cytoscape.buildOntologyServer();
-
- // Instantiate Nested Network Image Manager singleton
- NestedNetworkImageManager.getNetworkImageGenerator();
+
NestedNetworkImageManager.instantiateNestedNetworkImageManagerSingleton();
+
// get the manager so it can test for webstart before
menus are
// created (little hacky)
PluginManager.getPluginManager();
Modified: cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
2009-11-24 23:49:03 UTC (rev 18573)
+++ cytoscape/trunk/src/cytoscape/util/NestedNetworkImageManager.java
2009-11-24 23:36:43 UTC (rev 18574)
@@ -35,34 +35,28 @@
private static final int DEF_WIDTH = 500;
private static final int DEF_HEIGHT = 500;
- private static NestedNetworkImageManager networkImageGenerator;
+ private static NestedNetworkImageManager theNestedNetworkImageManager =
null;
+ private static Map<CyNetwork, ImageAndReferenceCount> networkToImageMap;
+
- private final Map<CyNetwork, ImageAndReferenceCount> networkToImageMap;
-
- static {
+ public static void instantiateNestedNetworkImageManagerSingleton() {
try {
- networkImageGenerator = new NestedNetworkImageManager();
- } catch (IOException e) {
- // TODO Auto-generated catch block
+ if (theNestedNetworkImageManager == null)
+ theNestedNetworkImageManager = new
NestedNetworkImageManager();
+ } catch (final IOException e) {
e.printStackTrace();
}
}
-
- public static NestedNetworkImageManager getNetworkImageGenerator() {
- return networkImageGenerator;
- }
-
private NestedNetworkImageManager() throws IOException {
DEF_IMAGE =
ImageIO.read(Cytoscape.class.getResource("/cytoscape/images/default_network.png"));
- networkToImageMap = new HashMap<CyNetwork,
ImageAndReferenceCount>();
+ NestedNetworkImageManager.networkToImageMap = new
HashMap<CyNetwork, ImageAndReferenceCount>();
Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(this);
-
}
-
-
- public Image getImage(final CyNetwork network) {
+
+
+ private Image getImage(final CyNetwork network) {
if (networkToImageMap.get(network) == null) {
return null;
} else {
@@ -71,8 +65,9 @@
}
- public int getImageCount() {
- return this.networkToImageMap.size();
+ /** Used for unit tests. */
+ static int getImageCount() {
+ return NestedNetworkImageManager.networkToImageMap.size();
}
Modified:
cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
===================================================================
--- cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
2009-11-24 23:49:03 UTC (rev 18573)
+++ cytoscape/trunk/tests/cytoscape/util/NestedNetworkImageManagerTest.java
2009-11-24 23:36:43 UTC (rev 18574)
@@ -13,9 +13,7 @@
protected void setUp() throws Exception {
super.setUp();
-
- // Instantiate Nested Network Image Manager singleton
- NestedNetworkImageManager.getNetworkImageGenerator();
+
NestedNetworkImageManager.instantiateNestedNetworkImageManagerSingleton();
}
@@ -35,9 +33,9 @@
assertNotNull(m1);
assertNotNull(Cytoscape.getCyNode("M2"));
assertNotNull(Cytoscape.getCyNode("M3"));
- assertEquals(3,
NestedNetworkImageManager.getNetworkImageGenerator().getImageCount());
+ assertEquals(3, NestedNetworkImageManager.getImageCount());
m1.setNestedNetwork(null);
- assertEquals(2,
NestedNetworkImageManager.getNetworkImageGenerator().getImageCount());
+ assertEquals(2, NestedNetworkImageManager.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=en.
