Author: scooter
Date: 2012-08-07 13:55:27 -0700 (Tue, 07 Aug 2012)
New Revision: 30113
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyNetwork.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyTableUtil.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTableManagerTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableUtilTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractGraphObjectTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCyRootNetworkTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCySubNetworkTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNetworkTableManagerImpl.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/NetworkNameSetListener.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/CyTableManagerTest.java
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/TestCyNetworkFactory.java
Log:
Model changes to support "Plan B".
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyNetwork.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyNetwork.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyNetwork.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -47,16 +47,27 @@
String SELECTED = "selected";
/**
- * The name of the default <b>public</b>
+ * The name of the local <b>public</b>
* CyTable that is created by default for CyNetworks,
* CyNodes, and CyEdges. Other CyTables may also be associated with
networks
* -- see {@link CyTableManager} for more information.
* The table should be referenced using this constant:
- * <code>CyNetwork.DEFAULT_ATTRS</code>.
+ * <code>CyNetwork.LOCAL_ATTRS</code>.
*/
- String DEFAULT_ATTRS = "USER";
+ String LOCAL_ATTRS = "LOCAL";
/**
+ * The name of the <b>public</b>
+ * CyTable that is shared for CyNetworks,
+ * CyNodes, and CyEdges in the same {@link CyRootNetwork}.
+ * Other CyTables may also be associated with networks
+ * -- see {@link CyTableManager} for more information.
+ * The table should be referenced using this constant:
+ * <code>CyNetwork.SHARED_ATTRS</code>.
+ */
+ String SHARED_ATTRS =
org.cytoscape.model.subnetwork.CyRootNetwork.SHARED_ATTRS;
+
+ /**
* The name of the default <b>hidden</b> CyTable that is created
* by default for CyNetworks, CyNodes, and
* CyEdges. Other CyTables may also be associated with networks --
@@ -278,28 +289,52 @@
/**
* A convenience method returns the default attribute table for this
network.
* This is equivalent to
- *
<code>CyNetworkTableManager.getTableMap(this,CyNetwork.class,CyNetwork.DEFAULT_ATTRS);</code>
+ *
<code>CyNetworkTableManager.getTableMap(this,CyNetwork.class,CyNetwork.LOCAL_ATTRS);</code>
* @return The default attribute table for this network.
*/
- CyTable getDefaultNetworkTable();
+ CyTable getLocalNetworkTable();
/**
* A convenience method returns the default attribute table for the
nodes of this network.
* This is equivalent to
- *
<code>CyNetworkTableManager.getTable(this,CyNode.class,CyNetwork.DEFAULT_ATTRS);</code>
+ *
<code>CyNetworkTableManager.getTable(this,CyNode.class,CyNetwork.LOCAL_ATTRS);</code>
* @return The default attribute table for the nodes of this network.
*/
- CyTable getDefaultNodeTable();
+ CyTable getLocalNodeTable();
/**
* A convenience method returns the default attribute table for the
edges of this network.
* This is equivalent to
- *
<code>CyNetworkTableManager.getTableMap(this,CyEdge.class,CyNetwork.DEFAULT_ATTRS);</code>
+ *
<code>CyNetworkTableManager.getTableMap(this,CyEdge.class,CyNetwork.LOCAL_ATTRS);</code>
* @return The default attribute table for the edges of this network.
*/
- CyTable getDefaultEdgeTable();
+ CyTable getLocalEdgeTable();
/**
+ * A convenience method returns the shared attribute table for this
network.
+ * This is equivalent to
+ *
<code>CyNetworkTableManager.getTableMap(this,CyNetwork.class,CyNetwork.SHARED_ATTRS);</code>
+ * @return The default attribute table for this network.
+ */
+ CyTable getSharedNetworkTable();
+
+ /**
+ * A convenience method returns the shared attribute table for the
nodes of this network.
+ * This is equivalent to
+ *
<code>CyNetworkTableManager.getTable(this,CyNode.class,CyNetwork.SHARED_ATTRS);</code>
+ * @return The default attribute table for the nodes of this network.
+ */
+ CyTable getSharedNodeTable();
+
+ /**
+ * A convenience method returns the shared attribute table for the
edges of this network.
+ * This is equivalent to
+ *
<code>CyNetworkTableManager.getTableMap(this,CyEdge.class,CyNetwork.SHARED_ATTRS);</code>
+ * @return The default attribute table for the edges of this network.
+ */
+ CyTable getSharedEdgeTable();
+
+ /**
* Returns the table with the specified namespace and type from this
* network.
* @param type Type of {@link CyIdentifiable} associated with the table.
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyTableUtil.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyTableUtil.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/main/java/org/cytoscape/model/CyTableUtil.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -45,50 +45,83 @@
/**
* A utility method that returns a list of nodes that have a boolean
attribute
- * in the {@link CyNetwork#DEFAULT_ATTRS} namespace specified by
columnName and are in
- * the specified state. If the attribute doesn't exist or is not of
type
+ * in the {@link CyNetwork#SHARED_ATTRS} or {@link
CyNetwork#LOCAL_ATTRS} namespaces
+ * specified by columnName and are in
+ * the specified state. The {@link CyNetwork#LOCAL_ATTRS} namespace is
searched first,
+ * so will have precedence when the column exists in both tables.
+ * If the column doesn't exist in either table, or is not of type
* Boolean an IllegalArgumentException will be thrown.
* @param net The network to be queried.
* @param columnName The name of the column to be tested.
* @param state The state being queried.
* @return a list of nodes that have a boolean attribute in the
- * {@link CyNetwork#DEFAULT_ATTRS} namespace specified by columnName
and are in
+ * {@link CyNetwork#SHARED_ATTRS} or {@link CyNetwork@LOCAL_ATTRS}
namespace specified by columnName and are in
* the specified state.
*/
public static List<CyNode> getNodesInState(final CyNetwork net, final
String columnName, final boolean state) {
if ( net == null )
throw new NullPointerException("network is null");
List<CyNode> ret = new ArrayList<CyNode>();
- Collection<CyRow> rows =
net.getDefaultNodeTable().getMatchingRows(columnName, state);
- for (CyRow row : rows) {
- CyNode node = net.getNode(row.get(CyTable.SUID,
Long.class));
- if (node != null)
- ret.add(node);
+
+ // Start by looking in the local table
+ if(net.getLocalNodeTable().getColumn(columnName) != null) {
+ Collection<CyRow> rows =
net.getLocalNodeTable().getMatchingRows(columnName, state);
+ for (CyRow row : rows) {
+ CyNode node = net.getNode(row.get(CyTable.SUID,
Long.class));
+ if (node != null)
+ ret.add(node);
+ }
+ } else if(net.getSharedNodeTable().getColumn(columnName) !=
null) {
+ // Now look in the shared table
+ Collection<CyRow> rows =
net.getSharedNodeTable().getMatchingRows(columnName, state);
+ for (CyRow row : rows) {
+ CyNode node = net.getNode(row.get(CyTable.SUID,
Long.class));
+ if (node != null)
+ ret.add(node);
+ }
+ } else {
+ throw new IllegalArgumentException("No column
'"+columnName+"' in either local or shared node table");
}
+
return ret;
}
/**
* A utility method that returns a list of edges that have a boolean
attribute
- * in the {@link CyNetwork#DEFAULT_ATTRS} namespace specified by
columnName and are in
- * the specified state. If the attribute doesn't exist or is not of
type
+ * in the {@link CyNetwork#SHARED_ATTRS} or {@link
CyNetwork#LOCAL_ATTRS} namespaces
+ * specified by columnName and are in
+ * the specified state. The {@link CyNetwork#LOCAL_ATTRS} namespace is
searched first,
+ * so will have precedence when the column exists in both tables.
+ * If the column doesn't exist in either table, or is not of type
* Boolean an IllegalArgumentException will be thrown.
* @param net The network to be queried.
* @param columnName The name of the column to be tested.
* @param state The state being queried.
* @return a list of edges that have a boolean attribute in the
- * {@link CyNetwork#DEFAULT_ATTRS} namespace specified by columnName
and are in
- * the specified state.
+ * {@link CyNetwork#SHARED_ATTRS} or {@link CyNetwork@LOCAL_ATTRS}
namespace specified by columnName and are in
*/
public static List<CyEdge> getEdgesInState(final CyNetwork net, final
String columnName, final boolean state) {
if ( net == null )
throw new NullPointerException("network is null");
List<CyEdge> ret = new ArrayList<CyEdge>();
- Collection<CyRow> rows =
net.getDefaultEdgeTable().getMatchingRows(columnName, state);
- for (CyRow row : rows) {
- CyEdge edge = net.getEdge(row.get(CyTable.SUID,
Long.class));
- if (edge != null)
- ret.add(edge);
+ // Start by looking in the local table
+ if(net.getLocalEdgeTable().getColumn(columnName) != null) {
+ Collection<CyRow> rows =
net.getLocalEdgeTable().getMatchingRows(columnName, state);
+ for (CyRow row : rows) {
+ CyEdge edge = net.getEdge(row.get(CyTable.SUID,
Long.class));
+ if (edge != null)
+ ret.add(edge);
+ }
+ } else if(net.getSharedEdgeTable().getColumn(columnName) !=
null) {
+ // Now look in the shared table
+ Collection<CyRow> rows =
net.getSharedEdgeTable().getMatchingRows(columnName, state);
+ for (CyRow row : rows) {
+ CyEdge edge = net.getEdge(row.get(CyTable.SUID,
Long.class));
+ if (edge != null)
+ ret.add(edge);
+ }
+ } else {
+ throw new IllegalArgumentException("No column
'"+columnName+"' in either local or shared edge table");
}
return ret;
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTableManagerTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTableManagerTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTableManagerTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -77,7 +77,7 @@
private void checkTableMap(Map<String,CyTable> tableMap) {
// we should have at least the two default, but others may exist
assertTrue(tableMap.size() >= 2);
- assertTrue(tableMap.keySet().contains(CyNetwork.DEFAULT_ATTRS));
+ assertTrue(tableMap.keySet().contains(CyNetwork.LOCAL_ATTRS));
assertTrue(tableMap.keySet().contains(CyNetwork.HIDDEN_ATTRS));
}
@@ -119,7 +119,7 @@
public void testRemoveDefaultTables() throws Exception {
for (Class<? extends CyIdentifiable> type : new Class[] {
CyNetwork.class, CyNode.class, CyEdge.class }) {
try {
- mgr.removeTable(goodNetwork, type,
CyNetwork.DEFAULT_ATTRS);
+ mgr.removeTable(goodNetwork, type,
CyNetwork.LOCAL_ATTRS);
fail();
} catch (IllegalArgumentException e) {
}
@@ -130,7 +130,7 @@
public void testSetDefaultTables() throws Exception {
for (Class<? extends CyIdentifiable> type : new Class[] {
CyNetwork.class, CyNode.class, CyEdge.class }) {
try {
- mgr.setTable(goodNetwork, type,
CyNetwork.DEFAULT_ATTRS, table1);
+ mgr.setTable(goodNetwork, type,
CyNetwork.LOCAL_ATTRS, table1);
fail();
} catch (IllegalArgumentException e) {
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -844,8 +844,8 @@
// As long as the object is not null and is an instance of
CyRow, we
// should be satisfied. Don't test any other properties of
CyRow.
// Leave that to the CyRow unit tests.
- assertNotNull("cyattrs exists", net.getRow(net,
CyNetwork.DEFAULT_ATTRS));
- assertTrue("cyattrs is CyRow", net.getRow(net,
CyNetwork.DEFAULT_ATTRS) instanceof CyRow);
+ assertNotNull("cyattrs exists", net.getRow(net,
CyNetwork.LOCAL_ATTRS));
+ assertTrue("cyattrs is CyRow", net.getRow(net,
CyNetwork.LOCAL_ATTRS) instanceof CyRow);
}
@Test(expected=NullPointerException.class)
@@ -855,7 +855,7 @@
@Test(expected=NullPointerException.class)
public void testGetCyRowNullEntry() {
- net.getRow(null,CyNetwork.DEFAULT_ATTRS);
+ net.getRow(null,CyNetwork.LOCAL_ATTRS);
}
@Test(expected=NullPointerException.class)
@@ -870,20 +870,20 @@
@Test
public void testGetDefaultNetworkTable() {
- assertNotNull(net.getDefaultNetworkTable());
- assertEquals(String.class,
net.getDefaultNetworkTable().getColumn(CyNetwork.NAME).getType());
+ assertNotNull(net.getLocalNetworkTable());
+ assertEquals(String.class,
net.getLocalNetworkTable().getColumn(CyNetwork.NAME).getType());
}
@Test
public void testGetDefaultNodeTable() {
- assertNotNull(net.getDefaultNodeTable());
- assertEquals(String.class,
net.getDefaultNodeTable().getColumn(CyNetwork.NAME).getType());
+ assertNotNull(net.getLocalNodeTable());
+ assertEquals(String.class,
net.getLocalNodeTable().getColumn(CyNetwork.NAME).getType());
}
@Test
public void testGetDefaultEdgeTable() {
- assertNotNull(net.getDefaultEdgeTable());
- assertEquals(String.class,
net.getDefaultEdgeTable().getColumn(CyNetwork.NAME).getType());
+ assertNotNull(net.getLocalEdgeTable());
+ assertEquals(String.class,
net.getLocalEdgeTable().getColumn(CyNetwork.NAME).getType());
}
@Test
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -55,7 +55,7 @@
@Test
public void testReset() {
- mgr.addTable(goodNetwork.getDefaultNodeTable());
+ mgr.addTable(goodNetwork.getLocalNodeTable());
assertFalse(mgr.getAllTables(true).isEmpty());
mgr.reset();
assertTrue(mgr.getAllTables(true).isEmpty());
@@ -78,7 +78,7 @@
assertNotNull(mgr.getGlobalTables());
mgr.addTable(globalTable);
- mgr.addTable(goodNetwork.getDefaultNodeTable());
+ mgr.addTable(goodNetwork.getLocalNodeTable());
assertEquals(1, mgr.getGlobalTables().size());
assertEquals(globalTable,
mgr.getGlobalTables().iterator().next());
@@ -107,7 +107,7 @@
assertEquals(3, nodeTables.size());
assertEquals(3, edgeTables.size());
-
assertTrue(networkTables.contains(goodNetwork.getDefaultNetworkTable()));
+
assertTrue(networkTables.contains(goodNetwork.getLocalNetworkTable()));
final CyTable hidden = networkTableMgr.getTable(goodNetwork,
CyNetwork.class, CyNetwork.HIDDEN_ATTRS);
assertTrue(networkTables.contains(hidden));
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableUtilTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableUtilTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractCyTableUtilTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -60,8 +60,8 @@
edge1 = net.addEdge(node1, node2, true);
edge2 = net.addEdge(node1, node2, true);
- net.getDefaultNodeTable().createColumn(columnName,
Boolean.class, false);
- net.getDefaultEdgeTable().createColumn(columnName,
Boolean.class, false);
+ net.getLocalNodeTable().createColumn(columnName, Boolean.class,
false);
+ net.getLocalEdgeTable().createColumn(columnName, Boolean.class,
false);
net.getRow(node1).set(columnName, true);
net.getRow(node2).set(columnName, false);
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractGraphObjectTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractGraphObjectTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/AbstractGraphObjectTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -81,20 +81,20 @@
// should be satisfied. Don't test any other properties of
CyRow.
// Leave that to the CyRow unit tests.
CyNode n1 = net.addNode();
- assertNotNull("cyattrs exists", net.getRow(n1,"USER"));
- assertTrue("cyattrs is CyRow", net.getRow(n1,"USER") instanceof
CyRow);
+ assertNotNull("cyattrs exists", net.getRow(n1,"LOCAL"));
+ assertTrue("cyattrs is CyRow", net.getRow(n1,"LOCAL")
instanceof CyRow);
CyNode n2 = net.addNode();
- assertNotNull("cyattrs exists", net.getRow(n2,"USER"));
- assertTrue("cyattrs is CyRow", net.getRow(n2,"USER") instanceof
CyRow);
+ assertNotNull("cyattrs exists", net.getRow(n2,"LOCAL"));
+ assertTrue("cyattrs is CyRow", net.getRow(n2,"LOCAL")
instanceof CyRow);
CyEdge e1 = net.addEdge(n1, n2, true);
- assertNotNull("cyattrs exists", net.getRow(e1,"USER"));
- assertTrue("cyattrs is CyRow", net.getRow(e1,"USER") instanceof
CyRow);
+ assertNotNull("cyattrs exists", net.getRow(e1,"LOCAL"));
+ assertTrue("cyattrs is CyRow", net.getRow(e1,"LOCAL")
instanceof CyRow);
CyEdge e2 = net.addEdge(n1, n2, false);
- assertNotNull("cyattrs exists", net.getRow(e2,"USER"));
- assertTrue("cyattrs is CyRow", net.getRow(e2,"USER") instanceof
CyRow);
+ assertNotNull("cyattrs exists", net.getRow(e2,"LOCAL"));
+ assertTrue("cyattrs is CyRow", net.getRow(e2,"LOCAL")
instanceof CyRow);
}
@Test
@@ -102,7 +102,7 @@
CyNode n1 = net.addNode();
assertNotNull("cyattrs exists", net.getRow(n1));
assertTrue("cyattrs is CyRow", net.getRow(n1) instanceof CyRow);
- assertTrue("attrs equals getCyRow",
net.getRow(n1).equals(net.getRow(n1,"USER")));
+ assertTrue("attrs equals getCyRow",
net.getRow(n1).equals(net.getRow(n1,"LOCAL")));
}
@Test
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCyRootNetworkTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCyRootNetworkTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCyRootNetworkTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -663,7 +663,7 @@
assertNotNull(shared);
shared.createColumn("homer",String.class,false);
CySubNetwork sub = root.addSubNetwork();
- assertNotNull( sub.getDefaultNetworkTable().getColumn("homer")
);
+ assertNotNull( sub.getSharedNetworkTable().getColumn("homer")
);
}
@Test
@@ -672,7 +672,7 @@
assertNotNull(shared);
shared.createColumn("homer",String.class,false);
CySubNetwork sub = root.addSubNetwork();
- assertNotNull( sub.getDefaultNodeTable().getColumn("homer") );
+ assertNotNull( sub.getSharedNodeTable().getColumn("homer") );
}
@Test
@@ -681,7 +681,7 @@
assertNotNull(shared);
shared.createColumn("homer",String.class,false);
CySubNetwork sub = root.addSubNetwork();
- assertNotNull( sub.getDefaultEdgeTable().getColumn("homer") );
+ assertNotNull( sub.getSharedEdgeTable().getColumn("homer") );
}
@Test
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCySubNetworkTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCySubNetworkTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/api/model-api/src/test/java/org/cytoscape/model/subnetwork/AbstractCySubNetworkTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -383,13 +383,14 @@
final List<CyNode> subNodes = sub.getNodeList();
assertEquals(1, subNodes.size());
final CyNode subNode = subNodes.get(0);
- String newName =
sub.getDefaultNodeTable().getRow(subNode.getSUID()).get(CyNetwork.NAME,
String.class);
- String newSharedName =
sub.getDefaultNodeTable().getRow(subNode.getSUID()).get(CyRootNetwork.SHARED_NAME,
String.class);
+ String newName =
sub.getLocalNodeTable().getRow(subNode.getSUID()).get(CyNetwork.NAME,
String.class);
+ String newSharedName =
sub.getSharedNodeTable().getRow(subNode.getSUID()).get(CyRootNetwork.SHARED_NAME,
String.class);
assertEquals( "homer", newName);
assertEquals( "homer", newSharedName);
- assertEquals( "homer",
sub.getRow(subNode).get(CyRootNetwork.SHARED_NAME, String.class) );
+ // Not sure this makes sense.....
+ // assertEquals( "homer",
sub.getRow(subNode).get(CyRootNetwork.SHARED_NAME, String.class) );
assertEquals( "homer",
sub.getRow(subNode).get(CyNetwork.NAME,String.class) );
}
@@ -402,7 +403,7 @@
sub.addNode(n1);
List<CyNode> subNodes = sub.getNodeList();
- assertTrue(
sub.getRow(subNodes.get(0)).get(CyNetwork.SELECTED,Boolean.class) );
+ // assertTrue(
sub.getRow(subNodes.get(0)).get(CyNetwork.SELECTED,Boolean.class) );
}
@Test
@@ -427,7 +428,7 @@
final CyEdge newEdge = subEdges.get(0);
final CyRow row = sub.getRow(newEdge);
- assertEquals( "homer", row.get(CyRootNetwork.SHARED_NAME,
String.class));
+ // assertEquals( "homer", row.get(CyRootNetwork.SHARED_NAME,
String.class));
assertEquals( "homer", row.get(CyNetwork.NAME, String.class));
}
@@ -464,7 +465,7 @@
sub.addEdge(e1);
List<CyEdge> subEdges = sub.getEdgeList();
-
assertTrue(sub.getRow(subEdges.get(0)).get(CyNetwork.SELECTED,Boolean.class) );
+ //
assertTrue(sub.getRow(subEdges.get(0)).get(CyNetwork.SELECTED,Boolean.class) );
}
@@ -489,9 +490,9 @@
System.out.println("Root network class = " + root.getClass());
// Make sure required columns exists
- final CyTable nodeTable = root.getDefaultNodeTable();
- final CyTable edgeTable = root.getDefaultEdgeTable();
- final CyTable networkTable = root.getDefaultNetworkTable();
+ final CyTable nodeTable = root.getLocalNodeTable();
+ final CyTable edgeTable = root.getLocalEdgeTable();
+ final CyTable networkTable = root.getLocalNetworkTable();
final CyTable nodeSharedTable = root.getSharedNodeTable();
final CyTable edgeSharedTable = root.getSharedEdgeTable();
@@ -527,16 +528,16 @@
newNet.addNode(n1);
newNet.addNode(n2);
newNet.addEdge(e1);
- final CyTable newNetNodeTable = newNet.getDefaultNodeTable();
+ final CyTable newNetNodeTable = newNet.getLocalNodeTable();
final Collection<CyColumn> newNodeColumns =
newNetNodeTable.getColumns();
for(CyColumn col: newNodeColumns)
System.out.println("New Node Table column: " +
col.getName());
- assertEquals(4, newNodeColumns.size());
+ assertEquals(3, newNodeColumns.size());
final CyColumn nameCol =
newNetNodeTable.getColumn(CyRootNetwork.NAME);
- final CyColumn sharedNameCol =
newNetNodeTable.getColumn(CyRootNetwork.SHARED_NAME);
+ final CyColumn sharedNameCol =
nodeSharedTable.getColumn(CyRootNetwork.SHARED_NAME);
assertNotNull(nameCol);
assertNotNull(sharedNameCol);
@@ -544,7 +545,7 @@
assertNotNull(nameN1);
assertEquals("node1", nameN1);
- final String sharedNameN1 =
newNet.getRow(n1).get(CyRootNetwork.SHARED_NAME, String.class);
+ final String sharedNameN1 =
newNet.getRow(n1,CyNetwork.SHARED_ATTRS).get(CyRootNetwork.SHARED_NAME,
String.class);
assertNotNull(sharedNameN1);
assertEquals("node1", sharedNameN1);
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNetworkTableManagerImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNetworkTableManagerImpl.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyNetworkTableManagerImpl.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -59,8 +59,11 @@
}
- if (namespace.equals(CyNetwork.DEFAULT_ATTRS) &&
reference.get(CyNetwork.DEFAULT_ATTRS) != null)
- throw new IllegalArgumentException("cannot overwrite
default tables");
+ if (namespace.equals(CyNetwork.LOCAL_ATTRS) &&
reference.get(CyNetwork.LOCAL_ATTRS) != null)
+ throw new IllegalArgumentException("cannot overwrite
local tables");
+
+ if (namespace.equals(CyNetwork.SHARED_ATTRS) &&
reference.get(CyNetwork.SHARED_ATTRS) != null)
+ throw new IllegalArgumentException("cannot overwrite
shared tables");
reference.put(namespace, table);
}
@@ -100,9 +103,13 @@
throw new IllegalArgumentException("namespace cannot be
null");
}
- if (namespace.equals(CyNetwork.DEFAULT_ATTRS)) {
- throw new IllegalArgumentException("cannot remove
default tables");
+ if (namespace.equals(CyNetwork.LOCAL_ATTRS)) {
+ throw new IllegalArgumentException("cannot remove local
tables");
}
+
+ if (namespace.equals(CyNetwork.SHARED_ATTRS)) {
+ throw new IllegalArgumentException("cannot remove
shared tables");
+ }
Map<Class<? extends CyIdentifiable>, Map<String, CyTable>>
byType = tables.get(network);
if (byType == null) {
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -283,11 +283,11 @@
CyTable nodeTable = networkTableMgr.getTable(this,
CyNode.class, CyRootNetwork.SHARED_ATTRS);
CyTable edgeTable = networkTableMgr.getTable(this,
CyEdge.class, CyRootNetwork.SHARED_ATTRS);
- linkDefaultTables(networkTable, sub.getDefaultNetworkTable());
- linkDefaultTables(nodeTable, sub.getDefaultNodeTable());
- linkDefaultTables(edgeTable, sub.getDefaultEdgeTable());
+ // linkDefaultTables(networkTable,
sub.getDefaultNetworkTable());
+ // linkDefaultTables(nodeTable, sub.getDefaultNodeTable());
+ // linkDefaultTables(edgeTable, sub.getDefaultEdgeTable());
// Another listener tracks changes to the interaction column in
local tables
-
interactionSetListener.addInterestedTables(sub.getDefaultEdgeTable(),
edgeTable);
+ //
interactionSetListener.addInterestedTables(sub.getDefaultEdgeTable(),
edgeTable);
subNetworks.add(sub);
return sub;
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/CySubNetworkImpl.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -190,6 +190,29 @@
return true;
}
+ @Override
+ public CyTable getSharedNetworkTable() {
+ return parent.getSharedNetworkTable();
+ }
+
+ @Override
+ public CyTable getSharedNodeTable() {
+ return parent.getSharedNodeTable();
+ }
+
+ @Override
+ public CyTable getSharedEdgeTable() {
+ return parent.getSharedEdgeTable();
+ }
+
+ @Override
+ public CyRow getRow(final CyIdentifiable entry, final String tableName)
{
+ if (tableName.equals(CyNetwork.SHARED_ATTRS)) {
+ return parent.getRow(entry, tableName);
+ }
+ return super.getRow(entry, tableName);
+ }
+
/**
* This method is called when an edge or a node is added to the networks
* which is indeed a copy of another edge/node. Hence, it copies all of
the
@@ -200,23 +223,13 @@
private void copyTableData(final CyIdentifiable graphObject) {
final String name = parent.getRow(graphObject).get(NAME,
String.class);
final CyRow sharedTableRow = parent.getRow(graphObject,
CyRootNetwork.SHARED_ATTRS);
- final CyRow defaultTableRow = parent.getRow(graphObject);
+ final CyRow localTableRow = parent.getRow(graphObject);
final CyRow targetRow = this.getRow(graphObject);
- // Step 1: Copy shared name as name of this new node
- final String sharedName =
sharedTableRow.get(CyRootNetwork.SHARED_NAME, String.class);
-
- if(sharedName != null)
- targetRow.set(CyNetwork.NAME, sharedName);
- else
- targetRow.set(CyNetwork.NAME, name);
-
- // Step 2: Copy selection state
- targetRow.set(CyNetwork.SELECTED,
defaultTableRow.get(CyNetwork.SELECTED, Boolean.class));
-
- // Step 3: Copy Interaction if edge
+
+ targetRow.set(CyNetwork.NAME,
sharedTableRow.get(CyRootNetwork.SHARED_NAME, String.class));
+ // targetRow.set(CyNetwork.SELECTED,
localTableRow.get(CyNetwork.SELECTED, Boolean.class));
if(graphObject instanceof CyEdge) {
- final String interaction =
sharedTableRow.get(CyRootNetwork.SHARED_INTERACTION, String.class);
- targetRow.set(CyEdge.INTERACTION, interaction);
+ targetRow.set(CyEdge.INTERACTION,
sharedTableRow.get(CyRootNetwork.SHARED_INTERACTION, String.class));
}
}
@@ -286,27 +299,27 @@
for (final CyTable table : networkTableMgr.getTables(this,
CyEdge.class).values())
tableMgr.addTable(table);
- updateSharedNames( getDefaultNodeTable(),
parent.getSharedNodeTable() );
- updateSharedNames( getDefaultEdgeTable(),
parent.getSharedEdgeTable() );
- updateSharedInteractions(getDefaultEdgeTable(),
parent.getSharedEdgeTable() );
- updateSharedNames( getDefaultNetworkTable(),
parent.getSharedNetworkTable() );
+ updateLocalNames( getLocalNodeTable(),
parent.getSharedNodeTable() );
+ updateLocalNames( getLocalEdgeTable(),
parent.getSharedEdgeTable() );
+ updateLocalInteractions(getLocalEdgeTable(),
parent.getSharedEdgeTable() );
+ updateLocalNames( getLocalNetworkTable(),
parent.getSharedNetworkTable() );
}
- private void updateSharedNames(CyTable src, CyTable tgt) {
+ private void updateLocalNames(CyTable src, CyTable tgt) {
for (CyRow sr : src.getAllRows()) {
CyRow tr = tgt.getRow(sr.get(CyIdentifiable.SUID,
Long.class));
- if (tr.get(CyRootNetwork.SHARED_NAME, String.class) ==
null)
- tr.set(CyRootNetwork.SHARED_NAME,
sr.get(CyNetwork.NAME, String.class));
+ if (sr.get(CyNetwork.NAME, String.class) == null)
+ sr.set(CyNetwork.NAME,
tr.get(CyRootNetwork.SHARED_NAME, String.class));
}
}
- private void updateSharedInteractions(CyTable src, CyTable tgt) {
+ private void updateLocalInteractions(CyTable src, CyTable tgt) {
for (CyRow sr : src.getAllRows()) {
CyRow tr = tgt.getRow(sr.get(CyIdentifiable.SUID,
Long.class));
- if (tr.get(CyRootNetwork.SHARED_INTERACTION,
String.class) == null)
- tr.set(CyRootNetwork.SHARED_INTERACTION,
sr.get(CyEdge.INTERACTION, String.class));
+ if (sr.get(CyEdge.INTERACTION, String.class) == null)
+ sr.set(CyEdge.INTERACTION,
tr.get(CyRootNetwork.SHARED_INTERACTION, String.class));
}
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -74,16 +74,16 @@
createEdgeTables(super.getSUID(), tableFactory, publicTables,
tableSizeDeterminer);
}
- public CyTable getDefaultNetworkTable() {
- return networkTableManager.getTable(networkRef.get(),
CyNetwork.class, CyNetwork.DEFAULT_ATTRS);
+ public CyTable getLocalNetworkTable() {
+ return networkTableManager.getTable(networkRef.get(),
CyNetwork.class, CyNetwork.LOCAL_ATTRS);
}
- public CyTable getDefaultNodeTable() {
- return networkTableManager.getTable(networkRef.get(),
CyNode.class, CyNetwork.DEFAULT_ATTRS);
+ public CyTable getLocalNodeTable() {
+ return networkTableManager.getTable(networkRef.get(),
CyNode.class, CyNetwork.LOCAL_ATTRS);
}
- public CyTable getDefaultEdgeTable() {
- return networkTableManager.getTable(networkRef.get(),
CyEdge.class, CyNetwork.DEFAULT_ATTRS);
+ public CyTable getLocalEdgeTable() {
+ return networkTableManager.getTable(networkRef.get(),
CyEdge.class, CyNetwork.LOCAL_ATTRS);
}
public CyTable getTable(Class<? extends CyIdentifiable> type, String
namespace) {
@@ -91,7 +91,7 @@
}
public CyRow getRow(final CyIdentifiable entry) {
- return getRow(entry, CyNetwork.DEFAULT_ATTRS);
+ return getRow(entry, CyNetwork.LOCAL_ATTRS);
}
public CyRow getRow(final CyIdentifiable entry, final String tableName)
{
@@ -124,8 +124,8 @@
private void createNetworkTables(long suidx, CyTableFactory
tableFactory, boolean pubTables) {
final CyTable defTable = tableFactory.createTable(suidx
- + " default network", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
- networkTableManager.setTable(networkRef.get(), CyNetwork.class,
CyNetwork.DEFAULT_ATTRS, defTable);
+ + " local network", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
+ networkTableManager.setTable(networkRef.get(), CyNetwork.class,
CyNetwork.LOCAL_ATTRS, defTable);
final CyTable hiddenTable = tableFactory.createTable(suidx
+ " hidden network", CyIdentifiable.SUID,
Long.class, false, false, InitialTableSize.SMALL);
@@ -137,8 +137,8 @@
private void createNodeTables(long suidx, CyTableFactory tableFactory,
boolean pubTables, int num) {
final CyTable defTable = tableFactory.createTable(suidx
- + " default node", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
- networkTableManager.setTable(networkRef.get(), CyNode.class,
CyNetwork.DEFAULT_ATTRS, defTable);
+ + " local node", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
+ networkTableManager.setTable(networkRef.get(), CyNode.class,
CyNetwork.LOCAL_ATTRS, defTable);
final CyTable hiddenTable = tableFactory.createTable(suidx
+ " hidden node", CyIdentifiable.SUID,
Long.class, false, false, InitialTableSize.SMALL);
@@ -149,9 +149,9 @@
}
private void createEdgeTables(long suidx, CyTableFactory tableFactory,
boolean pubTables, int num) {
- final CyTable defTable = tableFactory.createTable(suidx + "
default edge", CyIdentifiable.SUID, Long.class,
+ final CyTable defTable = tableFactory.createTable(suidx + "
local edge", CyIdentifiable.SUID, Long.class,
pubTables, false, InitialTableSize.SMALL);
- networkTableManager.setTable(networkRef.get(), CyEdge.class,
CyNetwork.DEFAULT_ATTRS, defTable);
+ networkTableManager.setTable(networkRef.get(), CyEdge.class,
CyNetwork.LOCAL_ATTRS, defTable);
final CyTable hiddenTable = tableFactory.createTable(suidx
+ " hidden edge", CyIdentifiable.SUID,
Long.class, false, false, InitialTableSize.SMALL);
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/NetworkNameSetListener.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/NetworkNameSetListener.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/NetworkNameSetListener.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -38,7 +38,7 @@
public void handleEvent(RowsSetEvent e) {
CyTable sourceTable = e.getSource();
- if (sourceTable.equals(rootNetwork.getDefaultNetworkTable())){
+ if (sourceTable.equals(rootNetwork.getLocalNetworkTable())){
updateRootNetworkTableNames(e.getPayloadCollection());
}
else{
@@ -51,11 +51,11 @@
private void updateSubNetworkTableNames( Collection<RowSetRecord>
payloadCollection, CyTable sourceTable) {
for (CyNetwork net: rootNetwork.getSubNetworkList()){
- if (sourceTable.equals(net.getDefaultNetworkTable())){
+ if (sourceTable.equals(net.getLocalNetworkTable())){
for ( RowSetRecord record :payloadCollection) {
// assume payload collection is for
same column
final Object name = record.getValue();
- setTablesName(name.toString() + "
default ", net.getDefaultEdgeTable(), net.getDefaultNodeTable(),
net.getDefaultNetworkTable());
+ setTablesName(name.toString() + " local
", net.getLocalEdgeTable(), net.getLocalNodeTable(),
net.getLocalNetworkTable());
return; //assuming that this even is
fired only for a single row
}
@@ -71,7 +71,7 @@
// assume payload collection is for same column
final Object name = record.getValue();
setTablesName(name + " root shared ",
rootNetwork.getSharedEdgeTable(), rootNetwork.getSharedNodeTable(),
rootNetwork.getSharedNetworkTable());
- setTablesName(name + " root default ",
rootNetwork.getDefaultEdgeTable(), rootNetwork.getDefaultNodeTable(),
rootNetwork.getDefaultNetworkTable());
+ setTablesName(name + " root local ",
rootNetwork.getLocalEdgeTable(), rootNetwork.getLocalNodeTable(),
rootNetwork.getLocalNetworkTable());
return;
}
@@ -106,8 +106,8 @@
private void updateSubNetworkTableNames(CyNetwork net, String name){
- net.getDefaultEdgeTable().setTitle(name + " default edge");
- net.getDefaultNetworkTable().setTitle(name + " default
network");
- net.getDefaultNodeTable().setTitle(name + " default node");
+ net.getLocalEdgeTable().setTitle(name + " local edge");
+ net.getLocalNetworkTable().setTitle(name + " local network");
+ net.getLocalNodeTable().setTitle(name + " local node");
}
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/CyTableManagerTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/CyTableManagerTest.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/CyTableManagerTest.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -88,10 +88,10 @@
@Test
public void immutableTableTest() {
- mgr.addTable(goodNetwork.getDefaultNodeTable());
+ mgr.addTable(goodNetwork.getLocalNodeTable());
boolean exceptionWasThrown = false;
try {
-
mgr.deleteTable(goodNetwork.getDefaultNodeTable().getSUID());
+
mgr.deleteTable(goodNetwork.getLocalNodeTable().getSUID());
} catch (IllegalArgumentException e) {
exceptionWasThrown = true;
}
Modified:
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/TestCyNetworkFactory.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/TestCyNetworkFactory.java
2012-08-07 20:02:52 UTC (rev 30112)
+++
csplugins/trunk/toronto/jm/cy3-shared-tables/impl/model-impl/impl/src/test/java/org/cytoscape/model/TestCyNetworkFactory.java
2012-08-07 20:55:27 UTC (rev 30113)
@@ -154,9 +154,9 @@
}
private void assertNetworkTablesVisibility(CyNetwork n, boolean
isPublic) {
- assertEquals(isPublic, n.getDefaultNetworkTable().isPublic());
- assertEquals(isPublic, n.getDefaultNodeTable().isPublic());
- assertEquals(isPublic, n.getDefaultEdgeTable().isPublic());
+ assertEquals(isPublic, n.getLocalNetworkTable().isPublic());
+ assertEquals(isPublic, n.getLocalNodeTable().isPublic());
+ assertEquals(isPublic, n.getLocalEdgeTable().isPublic());
}
}
--
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.
