Author: mes
Date: 2012-08-09 15:28:57 -0700 (Thu, 09 Aug 2012)
New Revision: 30144
Modified:
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/LocalTableFacade.java
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/SharedTableFacade.java
Log:
add row facade and abstracted out common table facade code
Modified:
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
===================================================================
---
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
2012-08-09 20:35:10 UTC (rev 30143)
+++
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/AbstractTableFacade.java
2012-08-09 22:28:57 UTC (rev 30144)
@@ -117,11 +117,6 @@
return actual.getColumns();
}
- public void deleteColumn(String columnName) {
- actual.deleteColumn(columnName);
-
- }
-
public CyRow getRow(Object primaryKey) {
CyRow actualRow = actual.getRow(primaryKey);
if ( actualRow == null )
Modified:
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/LocalTableFacade.java
===================================================================
---
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/LocalTableFacade.java
2012-08-09 20:35:10 UTC (rev 30143)
+++
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/LocalTableFacade.java
2012-08-09 22:28:57 UTC (rev 30144)
@@ -87,19 +87,23 @@
this.shared = shared;
// this adds virtual columns for any existing columns already
in the shared table
- local.addVirtualColumns(shared.getActualTable(),
CyIdentifiable.SUID, true);
+ local.addVirtualColumns(shared.getActualTable(),
CyIdentifiable.SUID, false);
}
CyTable getLocalTable() {
return local;
}
+ public void deleteColumn(String columnName) {
+ shared.deleteColumn(columnName);
+ }
+
public <T> void createColumn(String columnName, Class<?extends T> type,
boolean isImmutable) {
createColumn(columnName,type,isImmutable,null);
}
public <T> void createColumn(String columnName, Class<?extends T> type,
boolean isImmutable, T defaultValue) {
- logger.debug("delegating createColumn '" + columnName + "' from
local " + local.getTitle() + " to shared: " + shared.getTitle());
+ logger.debug("delegating createColumn '" + columnName + "' from
local " + local.getTitle() + " to shared: " + shared.getTitle() + ": " +
type.getName() + " " + isImmutable );
shared.createColumn(columnName,type,isImmutable,defaultValue);
}
Modified:
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/SharedTableFacade.java
===================================================================
---
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/SharedTableFacade.java
2012-08-09 20:35:10 UTC (rev 30143)
+++
csplugins/trunk/ucsd/mes/cy3-shared-local-tables/impl/model-impl/impl/src/main/java/org/cytoscape/model/internal/SharedTableFacade.java
2012-08-09 22:28:57 UTC (rev 30144)
@@ -102,6 +102,20 @@
return tables;
}
+
+ public void deleteColumn(String columnName) {
+ for ( CyTable local : localTables() ) {
+ if ( local == null ) {
+ logger.debug("NULL table!");
+ continue;
+ }
+
+ logger.debug("deleting virtual column: " + columnName +
" from local table: " + local.getTitle());
+ local.deleteColumn(columnName);
+ }
+ logger.debug("deleting shared olumn: " + columnName + " from
shared table: " + shared.getTitle());
+ shared.deleteColumn(columnName);
+ }
public <T> void createColumn(String columnName, Class<?extends T> type,
boolean isImmutable) {
createColumn(columnName, type, isImmutable,null);
--
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.
