Author: mes
Date: 2010-10-26 11:04:39 -0700 (Tue, 26 Oct 2010)
New Revision: 22440
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableManager.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
Log:
Moved management duties from CyTableFactory into CyTableManager
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
===================================================================
--- core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
2010-10-26 17:48:04 UTC (rev 22439)
+++ core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableFactory.java
2010-10-26 18:04:39 UTC (rev 22440)
@@ -55,24 +55,4 @@
* {...@link CyTable#isPublic}.
*/
CyTable createTable(String title, String primaryKey, Class<?>
primaryKeyType, boolean pub);
-
- // TODO move these into table manager!
-
- /**
- * Returns a list of all table SUIDs with the specified visibility.
- * @param includePrivate Whether to include private CyDataTables
- * in the list (i.e. all possible CyDataTables) or not.
- * @return A list containing CyTable SUIDs either
- * including private CyDataTables (i.e. meaning all possible
- * CyDataTables) or just public CyDataTables.
- */
- List<Long> getAllTableSUIDs(boolean includePrivate);
-
- /**
- * Returns the table with teh specified SUID.
- * @param suid The SUID identifying the CyTable.
- * @return The CyTable identified by the suid. Will return null if a
CyTable doesn't
- * exist for the specified SUID.
- */
- CyTable getTable(long suid);
}
Modified:
core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableManager.java
===================================================================
--- core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableManager.java
2010-10-26 17:48:04 UTC (rev 22439)
+++ core3/model-api/trunk/src/main/java/org/cytoscape/model/CyTableManager.java
2010-10-26 18:04:39 UTC (rev 22440)
@@ -37,6 +37,7 @@
package org.cytoscape.model;
import java.util.Map;
+import java.util.Set;
/**
@@ -54,4 +55,22 @@
* for the specified network.
*/
Map<String,CyTable> getTableMap(String type, CyNetwork network);
+
+ /**
+ * Returns a Set of all tables with the specified visibility.
+ * @param includePrivate Whether to include private CyTables
+ * in the list (i.e. all possible CyTables) or not.
+ * @return A Set containing CyTable SUIDs either
+ * including private CyTables (i.e. meaning all possible
+ * CyTables) or just public CyTables.
+ */
+ Set<CyTable> getAllTables(boolean includePrivate);
+
+ /**
+ * Returns the table with teh specified SUID.
+ * @param suid The SUID identifying the CyTable.
+ * @return The CyTable identified by the suid. Will return null if a
CyTable doesn't
+ * exist for the specified SUID.
+ */
+ CyTable getTable(long suid);
}
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2010-10-26 17:48:04 UTC (rev 22439)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyTableManagerTest.java
2010-10-26 18:04:39 UTC (rev 22440)
@@ -84,4 +84,14 @@
assertNull( mgr.getTableMap(CyTableEntry.NODE,null) );
assertNull( mgr.getTableMap(CyTableEntry.EDGE,null) );
}
+/*
+ public void testGetAllTables() {
+ }
+
+ public void testGetValidTable() {
+ }
+
+ public void testGetInvalidTable() {
+ }
+ */
}
--
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.
