Author: ruschein
Date: 2011-08-17 16:05:54 -0700 (Wed, 17 Aug 2011)
New Revision: 26590
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkTreeTableModel.java
Log:
Performance optimisation.
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkTreeTableModel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkTreeTableModel.java
2011-08-17 22:02:54 UTC (rev 26589)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkTreeTableModel.java
2011-08-17 23:05:54 UTC (rev 26590)
@@ -1,94 +1,88 @@
package org.cytoscape.internal.view;
+
import java.util.Enumeration;
import javax.swing.JOptionPane;
import javax.swing.tree.DefaultMutableTreeNode;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTableUtil;
import org.cytoscape.util.swing.AbstractTreeTableModel;
import org.cytoscape.util.swing.TreeTableModel;
-/**
- * Inner class that extends the AbstractTreeTableModel
- */
+
final class NetworkTreeTableModel extends AbstractTreeTableModel {
- /**
- *
- */
- private final NetworkPanel networkPanel;
- String[] columns = { "Network", "Nodes", "Edges" };
- Class[] columns_class = { TreeTableModel.class, String.class, String.class
};
+ private final NetworkPanel networkPanel;
+ String[] columns = { "Network", "Nodes", "Edges" };
+ Class[] columns_class = { TreeTableModel.class, String.class,
String.class };
- public NetworkTreeTableModel(NetworkPanel networkPanel, Object root) {
- super(root);
- this.networkPanel = networkPanel;
- }
+ public NetworkTreeTableModel(NetworkPanel networkPanel, Object root) {
+ super(root);
+ this.networkPanel = networkPanel;
+ }
- public Object getChild(Object parent, int index) {
- Enumeration tree_node_enum = ((DefaultMutableTreeNode)
getRoot()).breadthFirstEnumeration();
+ public Object getChild(Object parent, int index) {
+ Enumeration tree_node_enum = ((DefaultMutableTreeNode)
getRoot()).breadthFirstEnumeration();
- while (tree_node_enum.hasMoreElements()) {
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)
tree_node_enum.nextElement();
+ while (tree_node_enum.hasMoreElements()) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode)
tree_node_enum.nextElement();
- if (node == parent) {
- return node.getChildAt(index);
- }
- }
+ if (node == parent)
+ return node.getChildAt(index);
+ }
- return null;
- }
+ return null;
+ }
- public int getChildCount(Object parent) {
- Enumeration tree_node_enum = ((DefaultMutableTreeNode)
getRoot()).breadthFirstEnumeration();
+ public int getChildCount(Object parent) {
+ Enumeration tree_node_enum = ((DefaultMutableTreeNode)
getRoot()).breadthFirstEnumeration();
- while (tree_node_enum.hasMoreElements()) {
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)
tree_node_enum.nextElement();
+ while (tree_node_enum.hasMoreElements()) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode)
tree_node_enum.nextElement();
- if (node == parent) {
- return node.getChildCount();
- }
- }
+ if (node == parent) {
+ return node.getChildCount();
+ }
+ }
- return 0;
- }
+ return 0;
+ }
- public int getColumnCount() {
- return columns.length;
- }
+ public int getColumnCount() {
+ return columns.length;
+ }
- public String getColumnName(int column) {
- return columns[column];
- }
+ public String getColumnName(int column) {
+ return columns[column];
+ }
- public Class getColumnClass(int column) {
- return columns_class[column];
- }
+ public Class getColumnClass(int column) {
+ return columns_class[column];
+ }
- public Object getValueAt(Object node, int column) {
- if (column == 0)
- return ((DefaultMutableTreeNode) node).getUserObject();
- else if (column == 1) {
- CyNetwork cyNetwork =
this.networkPanel.netmgr.getNetwork(((NetworkTreeNode) node).getNetworkID());
+ public Object getValueAt(final Object node, final int column) {
+ if (column == 0)
+ return ((DefaultMutableTreeNode) node).getUserObject();
+ else if (column == 1) {
+ CyNetwork cyNetwork =
this.networkPanel.netmgr.getNetwork(((NetworkTreeNode) node).getNetworkID());
- return "" + cyNetwork.getNodeCount() + "("
- + CyTableUtil.getNodesInState(cyNetwork, "selected",
true).size() + ")";
- } else if (column == 2) {
- CyNetwork cyNetwork =
this.networkPanel.netmgr.getNetwork(((NetworkTreeNode) node).getNetworkID());
+ return "" + cyNetwork.getNodeCount() + "("
+ +
cyNetwork.getDefaultNodeTable().getMatchingRows(CyNetwork.SELECTED,
true).size() + ")";
+ } else if (column == 2) {
+ CyNetwork cyNetwork =
this.networkPanel.netmgr.getNetwork(((NetworkTreeNode) node).getNetworkID());
- return "" + cyNetwork.getEdgeCount() + "("
- + CyTableUtil.getEdgesInState(cyNetwork, "selected",
true).size() + ")";
- }
+ return "" + cyNetwork.getEdgeCount() + "("
+ +
cyNetwork.getDefaultEdgeTable().getMatchingRows(CyNetwork.SELECTED,
true).size() + ")";
+ }
- return "";
- }
+ return "";
+ }
- public void setValueAt(Object aValue, Object node, int column) {
- if (column == 0) {
- ((DefaultMutableTreeNode) node).setUserObject(aValue);
- } else
- JOptionPane.showMessageDialog(this.networkPanel, "Error: assigning
value at in NetworkPanel");
- // This function is not used to set node and edge values.
- }
+ public void setValueAt(Object aValue, Object node, int column) {
+ if (column == 0) {
+ ((DefaultMutableTreeNode) node).setUserObject(aValue);
+ } else
+ JOptionPane.showMessageDialog(this.networkPanel,
"Error: assigning value at in NetworkPanel");
+ // This function is not used to set node and edge values.
+ }
}
\ No newline at end of file
--
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.
