Author: pwang
Date: 2011-02-11 11:15:17 -0800 (Fri, 11 Feb 2011)
New Revision: 24101
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableChooser.java
Log:
Change event type
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-02-11 19:13:48 UTC (rev 24100)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-02-11 19:15:17 UTC (rev 24101)
@@ -29,13 +29,14 @@
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.view.model.events.NetworkViewAddedEvent;
import org.cytoscape.view.model.events.NetworkViewAddedListener;
-import org.cytoscape.model.events.TableDeletedListener;
+import org.cytoscape.model.events.TableAboutToBeDeletedListener;
+import org.cytoscape.model.events.TableAboutToBeDeletedEvent;
import javax.swing.table.DefaultTableModel;
@SuppressWarnings("serial")
public class TableBrowser
- extends JPanel implements CytoPanelComponent, ActionListener,
NetworkViewAddedListener, TableDeletedListener
+ extends JPanel implements CytoPanelComponent, ActionListener,
NetworkViewAddedListener, TableAboutToBeDeletedListener
{
private final CyTableManager tableManager;
private final CyServiceRegistrar serviceRegistrar;
@@ -133,7 +134,7 @@
comboBoxModel.addAndSetSelectedItem(nodeTable);
}
- public void handleEvent(TableDeletedEvent e){
+ public void handleEvent(TableAboutToBeDeletedEvent e){
final CyTable cyTable = e.getTable();
final MyComboBoxModel comboBoxModel =
(MyComboBoxModel)tableChooser.getModel();
comboBoxModel.removeItem(cyTable);
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableChooser.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableChooser.java
2011-02-11 19:13:48 UTC (rev 24100)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableChooser.java
2011-02-11 19:15:17 UTC (rev 24101)
@@ -109,15 +109,16 @@
if (tables.contains(deletedTable)) {
tables.remove(deletedTable);
- Collections.sort(tables, tableComparator);
+
oldSet.clear();
- for (final CyTable table : tables)
- oldSet.add(table);
- updateTableToStringMap();
- this.fireIntervalRemoved(this, 0, oldSet.size()+1);
+ if (tables.size() != 0){
+ Collections.sort(tables, tableComparator);
+ for (final CyTable table : tables)
+ oldSet.add(table);
+ }
}
-
- if (oldSet.size() ==0){
+
+ if (tables.size() == 0){
setSelectedItem(null);
}
else {
--
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.
