Author: thully
Date: 2011-02-02 14:31:10 -0800 (Wed, 02 Feb 2011)
New Revision: 24000
Modified:
cytoscape/trunk/coreplugins/browser/src/main/java/browser/AttributeModel.java
cytoscape/trunk/coreplugins/browser/src/main/java/browser/ui/AttributeBrowserToolBar.java
Log:
Added code to select attributes in sorted order from attribute model when using
Select All button
Modified:
cytoscape/trunk/coreplugins/browser/src/main/java/browser/AttributeModel.java
===================================================================
---
cytoscape/trunk/coreplugins/browser/src/main/java/browser/AttributeModel.java
2011-02-02 18:32:06 UTC (rev 23999)
+++
cytoscape/trunk/coreplugins/browser/src/main/java/browser/AttributeModel.java
2011-02-02 22:31:10 UTC (rev 24000)
@@ -118,6 +118,10 @@
notifyListeners(new ListDataEvent(this,
ListDataEvent.CONTENTS_CHANGED, 0,
attributeNames.size()));
}
+
+ public List<String> getAttributeNames() {
+ return attributeNames;
+ }
public Set<String> getNewAttributeNames() {
return newAttributeNames;
Modified:
cytoscape/trunk/coreplugins/browser/src/main/java/browser/ui/AttributeBrowserToolBar.java
===================================================================
---
cytoscape/trunk/coreplugins/browser/src/main/java/browser/ui/AttributeBrowserToolBar.java
2011-02-02 18:32:06 UTC (rev 23999)
+++
cytoscape/trunk/coreplugins/browser/src/main/java/browser/ui/AttributeBrowserToolBar.java
2011-02-02 22:31:10 UTC (rev 24000)
@@ -32,32 +32,15 @@
import static browser.DataObjectType.NETWORK;
import static browser.DataObjectType.NODES;
-import browser.AttributeBrowser;
-import browser.AttributeModel;
-import browser.DataObjectType;
-import browser.DataTableModel;
-import browser.ValidatedObjectAndEditString;
-
-import cytoscape.Cytoscape;
-import cytoscape.actions.ImportEdgeAttributesAction;
-import cytoscape.actions.ImportExpressionMatrixAction;
-import cytoscape.actions.ImportNodeAttributesAction;
-import cytoscape.data.CyAttributes;
-import cytoscape.data.CyAttributesUtils;
-import cytoscape.dialogs.NetworkMetaDataDialog;
-import cytoscape.logger.CyLogger;
-import cytoscape.util.swing.CheckBoxJList;
-
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,7 +64,22 @@
import org.jdesktop.layout.GroupLayout;
import org.jdesktop.layout.LayoutStyle;
+import browser.AttributeBrowser;
+import browser.AttributeModel;
+import browser.DataObjectType;
+import browser.DataTableModel;
+import browser.ValidatedObjectAndEditString;
+import cytoscape.Cytoscape;
+import cytoscape.actions.ImportEdgeAttributesAction;
+import cytoscape.actions.ImportExpressionMatrixAction;
+import cytoscape.actions.ImportNodeAttributesAction;
+import cytoscape.data.CyAttributes;
+import cytoscape.data.CyAttributesUtils;
+import cytoscape.dialogs.NetworkMetaDataDialog;
+import cytoscape.logger.CyLogger;
+import cytoscape.util.swing.CheckBoxJList;
+
/**
* Define toolbar for Attribute Browser.
*/
@@ -810,8 +808,7 @@
selectAllAttributesButton.addMouseListener(new
java.awt.event.MouseAdapter() {
public void
mouseClicked(java.awt.event.MouseEvent e) {
- List<String> existingAttrs =
CyAttributesUtils.getVisibleAttributeNames(attributes);
- updateList(existingAttrs);
+
updateList(attrModel.getAttributeNames());
try {
getUpdatedSelectedList();
tableModel.setTableData(null, orderedCol);
--
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.
