Author: thully
Date: 2012-11-26 15:12:16 -0800 (Mon, 26 Nov 2012)
New Revision: 30841
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
Log:
Fix for #1605:
* When importing tables for BioMart, make global table private by default (it
is made private upon import anyway)
* Hide Unassigned Tables tab when 0 public unassigned tables exist
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-11-26 21:14:17 UTC (rev 30840)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-11-26 23:12:16 UTC (rev 30841)
@@ -138,6 +138,13 @@
tableChooser.setEnabled(false);
// The last table is deleted, refresh the
browser table (this is a special case)
deleteTable(table);
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+
serviceRegistrar.unregisterService(GlobalTableBrowser.this,
CytoPanelComponent.class);
+ showSelectedTable();
+ }
+ });
}
}else
comboBoxModel.addAndSetSelectedItem(table);
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
2012-11-26 21:14:17 UTC (rev 30840)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/task/ImportTableTask.java
2012-11-26 23:12:16 UTC (rev 30841)
@@ -96,7 +96,7 @@
if (columnNames[0].contains("Query ERROR"))
throw new IOException("BioMart service returns error:
\n" + line);
- final CyTable globalTable =
tableFactory.createTable(query.getTableName(), key, String.class, true, true);
+ final CyTable globalTable =
tableFactory.createTable(query.getTableName(), key, String.class, false, true);
// For status report
int recordCount = 0;
--
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.
