Author: mes
Date: 2010-09-09 09:46:59 -0700 (Thu, 09 Sep 2010)
New Revision: 21753
Modified:
cytoscape3/trunk/application/
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
Log:
Changed CyDataTable name to CyTable
Property changes on: cytoscape3/trunk/application
___________________________________________________________________
Name: svn:ignore
-
+ .settings
target
.classpath
.project
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-09-09 15:38:15 UTC (rev 21752)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/actions/DeleteAction.java
2010-09-09 16:46:59 UTC (rev 21753)
@@ -36,11 +36,11 @@
import javax.swing.event.MenuEvent;
-import org.cytoscape.model.CyDataTableUtil;
+import org.cytoscape.model.CyTableUtil;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.session.CyNetworkManager;
@@ -68,7 +68,7 @@
*/
public static final String ACTION_TITLE = "Delete Selected Nodes and
Edges";
- private GraphObject graphObj = null;
+ private CyTableEntry graphObj = null;
private final UndoSupport undo;
@@ -86,7 +86,7 @@
* @param obj the object to be deleted
*/
- public DeleteAction(GraphObject obj, final UndoSupport undo, final
CyRootNetworkFactory root, CyNetworkManager netmgr) {
+ public DeleteAction(CyTableEntry obj, final UndoSupport undo, final
CyRootNetworkFactory root, CyNetworkManager netmgr) {
super(ACTION_TITLE,netmgr);
setPreferredMenu("Edit");
setAcceleratorCombo(KeyEvent.VK_DELETE, 0);
@@ -106,8 +106,8 @@
// delete from the base CySubNetwork so that our changes can be
undone
CySubNetwork cyNet = cyRootNetworkFactory.convert(
myView.getModel() ).getBaseNetwork();
- List<CyEdge> selEdges =
CyDataTableUtil.getEdgesInState(cyNet,"selected",true);
- List<CyNode> selNodes =
CyDataTableUtil.getNodesInState(cyNet,"selected",true);
+ List<CyEdge> selEdges =
CyTableUtil.getEdgesInState(cyNet,"selected",true);
+ List<CyNode> selNodes =
CyTableUtil.getNodesInState(cyNet,"selected",true);
CyNode cyNode;
CyEdge cyEdge;
@@ -158,8 +158,8 @@
return;
}
- List<CyNode> nodes =
CyDataTableUtil.getNodesInState(n,"selected",true);
- List<CyEdge> edges =
CyDataTableUtil.getEdgesInState(n,"selected",true);
+ List<CyNode> nodes = CyTableUtil.getNodesInState(n,"selected",true);
+ List<CyEdge> edges = CyTableUtil.getEdgesInState(n,"selected",true);
if ( nodes.size() > 0 || edges.size() > 0 )
setEnabled(true);
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-09-09 15:38:15 UTC (rev 21752)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-09-09 16:46:59 UTC (rev 21753)
@@ -37,8 +37,8 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyRow;
-import org.cytoscape.model.CyDataTableUtil;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTableUtil;
+import org.cytoscape.model.CyTable;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -113,7 +113,7 @@
CyNetwork network = netmgr.getCurrentNetwork();
// First, do we support selectedOnly?
- selectedNodes = new
HashSet<CyNode>(CyDataTableUtil.getNodesInState(network,"selected",true));
+ selectedNodes = new
HashSet<CyNode>(CyTableUtil.getNodesInState(network,"selected",true));
if (layout.supportsSelectedOnly() && (selectedNodes.size() >
0)) {
// Add selected node/all nodes menu
@@ -140,18 +140,18 @@
// Get the node attributes
//FIXME
//tableMgr.getTableMap("NODE", m_perspective)
- //CyDataTable nodeAttributes =
net.getNodeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
+ //CyTable nodeAttributes =
net.getNodeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
//addAttributeMenus(parent, nodeAttributes,
layout.supportsNodeAttributes(), selectedOnly);
}
private void addEdgeAttributeMenus(JMenu parent, CyNetwork net, boolean
selectedOnly) {
// Get the edge attributes
//FIXME
-// CyDataTable edgeAttributes =
net.getEdgeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
+// CyTable edgeAttributes =
net.getEdgeCyDataTables().get(CyNetwork.DEFAULT_ATTRS);
// addAttributeMenus(parent, edgeAttributes,
layout.supportsEdgeAttributes(), selectedOnly);
}
- private void addAttributeMenus(JMenu parent, CyDataTable attributes,
Set<Class<?>> typeSet,
+ private void addAttributeMenus(JMenu parent, CyTable attributes,
Set<Class<?>> typeSet,
boolean selectedOnly) {
// Add any special attributes
List specialList = layout.getInitialAttributeList();
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-09-09 15:38:15 UTC (rev 21752)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutMenu.java
2010-09-09 16:46:59 UTC (rev 21753)
@@ -40,7 +40,7 @@
import org.cytoscape.work.TaskManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyDataTableUtil;
+import org.cytoscape.model.CyTableUtil;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.model.CyNetworkView;
@@ -134,7 +134,7 @@
CyNetwork network = netmgr.getCurrentNetwork();
boolean someSelected = false;
if ( network != null ) {
- List<CyNode> selectedNodes =
CyDataTableUtil.getNodesInState(network,"selected",true);
+ List<CyNode> selectedNodes =
CyTableUtil.getNodesInState(network,"selected",true);
someSelected = (selectedNodes.size() > 0);
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-09-09 15:38:15 UTC (rev 21752)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectRegisterListener.java
2010-09-09 16:46:59 UTC (rev 21753)
@@ -9,7 +9,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.events.RowSetMicroListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.session.events.NetworkViewAddedEvent;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-09-09 15:38:15 UTC (rev 21752)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkPanel.java
2010-09-09 16:46:59 UTC (rev 21753)
@@ -67,7 +67,7 @@
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.cytoscape.model.CyDataTableUtil;
+import org.cytoscape.model.CyTableUtil;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.RowSetMicroListener;
import org.cytoscape.model.events.SelectedEdgesEvent;
@@ -625,7 +625,7 @@
return ""
+ cyNetwork.getNodeCount()
+ "("
- +
CyDataTableUtil.getNodesInState(cyNetwork,
+ +
CyTableUtil.getNodesInState(cyNetwork,
"selected",
true).size() + ")";
} else if (column == 2) {
CyNetwork cyNetwork = netmgr
@@ -634,7 +634,7 @@
return ""
+ cyNetwork.getEdgeCount()
+ "("
- +
CyDataTableUtil.getEdgesInState(cyNetwork,
+ +
CyTableUtil.getEdgesInState(cyNetwork,
"selected",
true).size() + ")";
}
--
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.
