Author: rozagh
Date: 2012-08-24 14:19:03 -0700 (Fri, 24 Aug 2012)
New Revision: 30270
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
Log:
fixes #1380 Setting only subnetwork default (facade) Node/Edge/Network tables
as public and everyother table in root and subnetworks as private. Applying the
changes to test cases checking the number of tables registered by the table
manager.
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -88,9 +88,10 @@
public void testGetLocalTables() {
// At this point, one network is added to the manager.
- // Root Network has 3 tables, and Sub Network has 6 tables.
+ // Root Network has 3 private facade shared tables and 3
private shared tables,
+ // and Sub Network has 3 hidden private tables, 3 private local
tables and 3 public facade tables.
assertEquals(15, mgr.getAllTables(true).size());
- assertEquals(12, mgr.getAllTables(false).size());
+ assertEquals(0, mgr.getAllTables(false).size());
Set<CyTable> nodeTables = mgr.getLocalTables(CyNode.class);
Set<CyTable> edgeTables = mgr.getLocalTables(CyEdge.class);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/export/table/SelectExportTableTask.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -45,11 +45,7 @@
final List<String> options = new ArrayList<String>();
for ( CyTable tbl :
cyTableManagerServiceRef.getAllTables(false)) {
-
- CyNetwork net = this.tableNetworkMap.get(tbl);
-
String title = tbl.getTitle();
-
options.add(title);
this.titleTableMap.put(title, tbl);
}
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -55,6 +55,7 @@
private final Long suid;
private final Map<CyRow,CyRow> facadeRows;
private final Map<CyColumn,CyColumn> facadeColumns;
+ private boolean isPublic = true;
public AbstractTableFacade(CyTable actual) {
this.actual = actual;
@@ -68,11 +69,11 @@
}
public boolean isPublic() {
- return actual.isPublic();
+ return isPublic;
}
public void setPublic(boolean isPublic) {
- actual.setPublic(isPublic);
+ this.isPublic = isPublic;
}
public CyTable.Mutability getMutability() {
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyRootNetworkImpl.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -111,7 +111,8 @@
(SharedTableFacade)(networkTableMgr.getTable(this,
CyNetwork.class, CyRootNetwork.SHARED_DEFAULT_ATTRS)),
(SharedTableFacade)(networkTableMgr.getTable(this,
CyNode.class, CyRootNetwork.SHARED_DEFAULT_ATTRS)),
(SharedTableFacade)(networkTableMgr.getTable(this, CyEdge.class,
CyRootNetwork.SHARED_DEFAULT_ATTRS)) );
-
+ setRootNetworkTablePrivacy();
+
getRow(this).set(CyNetwork.NAME, "");
columnAdder = new VirtualColumnAdder();
@@ -153,12 +154,18 @@
for (final CyTable table : tables)
tableMgr.addTable(table);
}
-
+ private void setRootNetworkTablePrivacy(){
+ this.getDefaultEdgeTable().setPublic(false);
+ this.getDefaultNetworkTable().setPublic(false);
+ this.getDefaultNodeTable().setPublic(false);
+
+ }
private void createRootNetworkTables() {
- final CyTable rawEdgeSharedTable =
tableFactory.createTable(suid + " shared edge", CyIdentifiable.SUID,
Long.class, publicTables, false, getInitialTableSize(subNetworks.size()));
-
+ final CyTable rawEdgeSharedTable =
tableFactory.createTable(suid + " shared edge", CyIdentifiable.SUID,
Long.class, false /*all root tables are private*/, false,
getInitialTableSize(subNetworks.size()));
+
final CyTable edgeSharedTable = new
SharedTableFacade(rawEdgeSharedTable,this,CyEdge.class,networkTableMgr);
-
+ edgeSharedTable.setPublic(false /*all root tables are
private*/);
+
networkTableMgr.setTable(this, CyEdge.class,
CyRootNetwork.SHARED_ATTRS, rawEdgeSharedTable);
networkTableMgr.setTable(this, CyEdge.class,
CyRootNetwork.SHARED_DEFAULT_ATTRS, edgeSharedTable);
@@ -166,18 +173,21 @@
edgeSharedTable.createColumn(CyRootNetwork.SHARED_INTERACTION,
String.class, true);
final CyTable rawNetworkSharedTable =
tableFactory.createTable(suid
- + " shared network", CyIdentifiable.SUID,
Long.class, publicTables, false, InitialTableSize.SMALL);
-
+ + " shared network", CyIdentifiable.SUID,
Long.class, false /*all root tables are private*/, false,
InitialTableSize.SMALL);
+
final CyTable networkSharedTable = new
SharedTableFacade(rawNetworkSharedTable,this,CyNetwork.class,networkTableMgr);
-
+ networkSharedTable.setPublic(false /*all root tables are
private*/);
+
networkTableMgr.setTable(this, CyNetwork.class,
CyRootNetwork.SHARED_ATTRS, rawNetworkSharedTable);
networkTableMgr.setTable(this, CyNetwork.class,
CyRootNetwork.SHARED_DEFAULT_ATTRS, networkSharedTable);
networkSharedTable.createColumn(CyRootNetwork.SHARED_NAME,
String.class, true);
- final CyTable rawNodeSharedTable =
tableFactory.createTable(suid + " shared node", CyIdentifiable.SUID,
Long.class, publicTables, false, getInitialTableSize(subNetworks.size()));
-
+ final CyTable rawNodeSharedTable =
tableFactory.createTable(suid + " shared node", CyIdentifiable.SUID,
Long.class, false /*all root tables are private*/, false,
getInitialTableSize(subNetworks.size()));
+
final CyTable nodeSharedTable = new
SharedTableFacade(rawNodeSharedTable,this,CyNode.class,networkTableMgr);
+ nodeSharedTable.setPublic(false /*all root tables are
private*/);
+
networkTableMgr.setTable(this, CyNode.class,
CyRootNetwork.SHARED_ATTRS, rawNodeSharedTable);
networkTableMgr.setTable(this, CyNode.class,
CyRootNetwork.SHARED_DEFAULT_ATTRS, nodeSharedTable);
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/DefaultTablesNetwork.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -128,15 +128,17 @@
return table.getRow(entry.getSUID());
}
-
+
private void createNetworkTables(long suidx, CyTableFactory
tableFactory, boolean pubTables, SharedTableFacade sharedNetworkTable) {
final CyTable defTable = tableFactory.createTable(suidx
- + " default network", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
+ + " default network", CyIdentifiable.SUID,
Long.class, false /* all local tables are private*/, false,
InitialTableSize.SMALL);
+
networkTableManager.setTable(networkRef.get(), CyNetwork.class,
CyNetwork.LOCAL_ATTRS, defTable);
LocalTableFacade localTable = new
LocalTableFacade(defTable,sharedNetworkTable);
+ localTable.setPublic(pubTables); //Set the privacy of facade
tables based on the given flag
networkTableManager.setTable(networkRef.get(), CyNetwork.class,
CyNetwork.DEFAULT_ATTRS, localTable);
if ( eventHelper instanceof TableEventHelperFacade )
-
((TableEventHelperFacade)eventHelper).registerFacade(localTable);
+
((TableEventHelperFacade)eventHelper).registerFacade(localTable);
final CyTable hiddenTable = tableFactory.createTable(suidx
+ " hidden network", CyIdentifiable.SUID,
Long.class, false, false, InitialTableSize.SMALL);
@@ -148,9 +150,12 @@
private void createNodeTables(long suidx, CyTableFactory tableFactory,
boolean pubTables, int num, SharedTableFacade sharedNodeTable) {
final CyTable defTable = tableFactory.createTable(suidx
- + " default node", CyIdentifiable.SUID,
Long.class, pubTables, false, InitialTableSize.SMALL);
+ + " default node", CyIdentifiable.SUID,
Long.class, false /* all local tables are private*/, false,
InitialTableSize.SMALL);
+
networkTableManager.setTable(networkRef.get(), CyNode.class,
CyNetwork.LOCAL_ATTRS, defTable);
LocalTableFacade localTable = new
LocalTableFacade(defTable,sharedNodeTable);
+ localTable.setPublic(pubTables); //Set the privacy of facade
tables based on the given flag
+
networkTableManager.setTable(networkRef.get(), CyNode.class,
CyNetwork.DEFAULT_ATTRS, localTable);
if ( eventHelper instanceof TableEventHelperFacade )
((TableEventHelperFacade)eventHelper).registerFacade(localTable);
@@ -165,10 +170,12 @@
private void createEdgeTables(long suidx, CyTableFactory tableFactory,
boolean pubTables, int num, SharedTableFacade sharedEdgeTable) {
final CyTable defTable = tableFactory.createTable(suidx + "
default edge", CyIdentifiable.SUID, Long.class,
- pubTables, false, InitialTableSize.SMALL);
+ false /* all local tables are private*/, false,
InitialTableSize.SMALL);
networkTableManager.setTable(networkRef.get(), CyEdge.class,
CyNetwork.LOCAL_ATTRS, defTable);
LocalTableFacade localTable = new
LocalTableFacade(defTable,sharedEdgeTable);
+ localTable.setPublic(pubTables); //Set the privacy of facade
tables based on the given flag
+
networkTableManager.setTable(networkRef.get(), CyEdge.class,
CyNetwork.DEFAULT_ATTRS, localTable);
if ( eventHelper instanceof TableEventHelperFacade )
((TableEventHelperFacade)eventHelper).registerFacade(localTable);
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -73,7 +73,7 @@
assertEquals(0,
renderingEngineManager.getAllRenderingEngines().size());
assertEquals(9, tableManager.getAllTables(true).size());
- assertEquals(6, tableManager.getAllTables(false).size());
+ assertEquals(3, tableManager.getAllTables(false).size());
}
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy263SimpleSessionLodingTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -87,7 +87,7 @@
assertEquals(0,
renderingEngineManager.getAllRenderingEngines().size());
assertEquals(63, tableManager.getAllTables(true).size());
- assertEquals(42, tableManager.getAllTables(false).size());
+ assertEquals(21, tableManager.getAllTables(false).size());
}
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy270SimpleSessionLodingTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -76,7 +76,7 @@
assertEquals(0,
renderingEngineManager.getAllRenderingEngines().size());
assertEquals(18, tableManager.getAllTables(true).size());
- assertEquals(12, tableManager.getAllTables(false).size());
+ assertEquals(6, tableManager.getAllTables(false).size());
}
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -81,7 +81,7 @@
// 6 tables per network
assertEquals(45, tableManager.getAllTables(true).size());
- assertEquals(30, tableManager.getAllTables(false).size());
+ assertEquals(15, tableManager.getAllTables(false).size());
// Visual Style
assertEquals(7, vmm.getAllVisualStyles().size());
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-08-24 20:00:01 UTC (rev 30269)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy3SimpleSessionLodingTest.java
2012-08-24 21:19:03 UTC (rev 30270)
@@ -78,8 +78,8 @@
assertEquals(36, tableManager.getAllTables(true).size());
- // 6 tables per network
- assertEquals(18, tableManager.getAllTables(false).size());
+ // 3 tables per network
+ assertEquals(6, tableManager.getAllTables(false).size());
}
private void checkNetwork(final CyNetwork network) {
--
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.
