Author: kono
Date: 2012-04-25 11:45:36 -0700 (Wed, 25 Apr 2012)
New Revision: 29005
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/util/TableBrowserUtil.java
Log:
fixes #901 Local utility functions are replaced by
CyTableManager.getGlobalTables().
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -47,14 +47,11 @@
locals.add(network.getDefaultEdgeTable().getTitle());
locals.add(network.getDefaultNetworkTable().getTitle());
}
+
+ final Set<CyTable> globalTableSet =
tableManager.getGlobalTables();
+ for (final CyTable table : globalTableSet)
+ globals.add(table.getTitle());
- final Set<CyTable> allTables = tableManager.getAllTables(false);
- for (final CyTable table : allTables) {
- name2tableMap.put(table.getTitle(), table);
- if (locals.contains(table.getTitle()) == false)
- globals.add(table.getTitle());
- }
-
if (globals.size() == 0)
throw new IllegalStateException("No Global Table in
current session!");
@@ -63,7 +60,6 @@
this.localTables.setSelectedValue(locals.get(0));
this.globalTables.setSelectedValue(globals.get(0));
-
}
@Override
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -49,7 +49,7 @@
private static final Dimension PANEL_SIZE = new Dimension(550, 400);
- protected final CyNetworkTableManager networkTableManager;
+ protected final CyTableManager tableManager;
protected final CyServiceRegistrar serviceRegistrar;
private final EquationCompiler compiler;
@@ -75,7 +75,7 @@
final CyNetworkManager networkManager, final
TableTaskFactory deleteTableTaskFactoryService,
final DialogTaskManager guiTaskManagerServiceRef, final
PopupMenuHelper popupMenuHelper,
final CyApplicationManager applicationManager, final
CyEventHelper eventHelper) {
- this.networkTableManager = networkTableManager;
+ this.tableManager = tableManager;
this.serviceRegistrar = serviceRegistrar;
this.compiler = compiler;
this.tabTitle = tabTitle;
@@ -180,9 +180,9 @@
if (btm == null) {
final BrowserTable browserTable = new
BrowserTable(openBrowser, compiler, popupMenuHelper,
- applicationManager, eventHelper,
networkTableManager);
+ applicationManager, eventHelper,
tableManager);
- btm = new BrowserTableModel(browserTable, currentTable,
compiler, networkTableManager);
+ btm = new BrowserTableModel(browserTable, currentTable,
compiler, tableManager);
browserTableModels.put(currentTable, btm);
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -56,10 +56,9 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.view.model.CyNetworkView;
import org.slf4j.Logger;
@@ -95,18 +94,18 @@
private final CyApplicationManager applicationManager;
private final CyEventHelper eventHelper;
- private final CyNetworkTableManager networkTableManager;
+ private final CyTableManager tableManager;
public BrowserTable(final OpenBrowser openBrowser, final
EquationCompiler compiler,
final PopupMenuHelper popupMenuHelper, final
CyApplicationManager applicationManager,
- final CyEventHelper eventHelper, final
CyNetworkTableManager networkTableManager) {
+ final CyEventHelper eventHelper, final CyTableManager
tableManager) {
this.openBrowser = openBrowser;
this.compiler = compiler;
this.popupMenuHelper = popupMenuHelper;
this.updateColumnComparators = false;
this.applicationManager = applicationManager;
this.eventHelper = eventHelper;
- this.networkTableManager = networkTableManager;
+ this.tableManager = tableManager;
initHeader();
setCellSelectionEnabled(true);
@@ -251,7 +250,7 @@
}
// Clear selection for non-global table
- if (TableBrowserUtil.isGlobalTable(table, networkTableManager)
== false) {
+ if (tableManager.getGlobalTables().contains(table) == false) {
List<CyRow> allRows =
btModel.getDataTable().getAllRows();
for (CyRow row : allRows) {
final Boolean val = row.get(CyNetwork.SELECTED,
Boolean.class);
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -18,11 +18,11 @@
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.model.CyColumn;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.events.ColumnCreatedEvent;
import org.cytoscape.model.events.ColumnCreatedListener;
import org.cytoscape.model.events.ColumnDeletedEvent;
@@ -45,7 +45,7 @@
private final CyTable dataTable;
private final EquationCompiler compiler;
- private final CyNetworkTableManager networkTableManager;
+ private final CyTableManager tableManager;
// If this is FALSE then we show all rows
private boolean regularViewMode;
@@ -58,12 +58,13 @@
private int maxRowIndex;
- public BrowserTableModel(final BrowserTable table, final CyTable
dataTable, final EquationCompiler compiler, final CyNetworkTableManager
networkTableManager) {
+ public BrowserTableModel(final BrowserTable table, final CyTable
dataTable, final EquationCompiler compiler,
+ final CyTableManager tableManager) {
this.table = table;
this.dataTable = dataTable;
this.compiler = compiler;
this.regularViewMode = false;
- this.networkTableManager = networkTableManager;
+ this.tableManager = tableManager;
initAttrNamesAndVisibilities();
@@ -330,7 +331,7 @@
@Override
public void run() {
try {
-
if(TableBrowserUtil.isGlobalTable(dataTable, networkTableManager) == false)
+
if(tableManager.getGlobalTables().contains(dataTable) == false)
bulkUpdate(rows);
}
catch (Exception e){
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -7,7 +7,6 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.browser.internal.TableChooser.GlobalTableComboBoxModel;
-import org.cytoscape.browser.internal.util.TableBrowserUtil;
import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetworkManager;
@@ -97,7 +96,7 @@
final CyTable newTable = e.getTable();
if (newTable.isPublic()) {
- if (TableBrowserUtil.isGlobalTable(newTable,
networkTableManager)) {
+ if (tableManager.getGlobalTables().contains(newTable)) {
final GlobalTableComboBoxModel comboBoxModel =
(GlobalTableComboBoxModel) tableChooser.getModel();
comboBoxModel.addAndSetSelectedItem(newTable);
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/util/TableBrowserUtil.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/util/TableBrowserUtil.java
2012-04-25 18:39:14 UTC (rev 29004)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/util/TableBrowserUtil.java
2012-04-25 18:45:36 UTC (rev 29005)
@@ -395,21 +395,4 @@
}
}
- public static boolean isGlobalTable(final CyTable table, final
CyNetworkTableManager networkTableManager) {
- final Set<CyTable> nonGlobalTables = new HashSet<CyTable>();
- final Set<CyNetwork> networks =
networkTableManager.getNetworkSet();
-
- for (CyNetwork network : networks) {
- for (Class<?> type : OBJECT_TYPES) {
- final Map<String, CyTable> objTables =
networkTableManager.getTables(network,
- (Class<? extends
CyIdentifiable>) type);
- nonGlobalTables.addAll(objTables.values());
- }
- }
-
- if (nonGlobalTables.contains(table))
- return false;
- else
- return true;
- }
}
--
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.
