Author: pwang
Date: 2012-03-26 16:29:47 -0700 (Mon, 26 Mar 2012)
New Revision: 28659
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/SetNetworkNameTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/BuildVisualStyleTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/CreateSubnetworkFromSearchTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/VisualStyleBuilder.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFromFileListTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
Log:
Fixed bug#810
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/AbstractNetworkFromSelectionTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -39,7 +39,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableUtil;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.model.subnetwork.CySubNetwork;
@@ -119,7 +119,7 @@
newNet.addEdge(edge);
tm.setProgress(0.5);
- newNet.getRow(newNet).set(CyTableEntry.NAME,
cyNetworkNaming.getSuggestedSubnetworkTitle(parentNetwork));
+ newNet.getRow(newNet).set(CyNetwork.NAME,
cyNetworkNaming.getSuggestedSubnetworkTitle(parentNetwork));
networkManager.addNetwork(newNet);
tm.setProgress(0.6);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CloneNetworkTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -42,7 +42,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
@@ -115,8 +115,8 @@
cloneNodes(origNet, newNet);
cloneEdges(origNet, newNet);
- newNet.getRow(newNet).set(CyTableEntry.NAME,
-
naming.getSuggestedNetworkTitle(origNet.getRow(origNet).get(CyTableEntry.NAME,
String.class)));
+ newNet.getRow(newNet).set(CyNetwork.NAME,
+
naming.getSuggestedNetworkTitle(origNet.getRow(origNet).get(CyNetwork.NAME,
String.class)));
return newNet;
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CopyExistingViewTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -40,7 +40,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableUtil;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.model.subnetwork.CySubNetwork;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/CreateNetworkViewTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -32,7 +32,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.task.AbstractNetworkTask;
import org.cytoscape.task.internal.layout.ApplyPreferredLayoutTask;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
@@ -113,7 +113,7 @@
} catch (Exception e) {
throw new Exception("Could not create network view for
network: "
- +
network.getRow(network).get(CyTableEntry.NAME, String.class), e);
+ + network.getRow(network).get(CyNetwork.NAME,
String.class), e);
}
if (undoSupport != null)
@@ -121,7 +121,7 @@
taskMonitor.setProgress(1.0d);
taskMonitor.setStatusMessage("Network view successfully create
for: "
- +
network.getRow(network).get(CyTableEntry.NAME, String.class));
+ + network.getRow(network).get(CyNetwork.NAME,
String.class));
logger.info("Network view creation finished in " +
(System.currentTimeMillis() -start) + " msec.");
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/creation/NewEmptyNetworkTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -34,7 +34,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
@@ -74,7 +74,7 @@
tm.setProgress(0.0);
final CyNetwork newNet = cnf.createNetwork();
tm.setProgress(0.2);
- newNet.getRow(newNet).set(CyTableEntry.NAME,
namingUtil.getSuggestedNetworkTitle("Network"));
+ newNet.getRow(newNet).set(CyNetwork.NAME,
namingUtil.getSuggestedNetworkTitle("Network"));
tm.setProgress(0.4);
view = cnvf.createNetworkView(newNet);
tm.setProgress(0.6);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesEdit.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -10,7 +10,7 @@
import org.cytoscape.model.CyEdge.Type;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
/** An undoable edit that will undo and redo the connecting of selected nodes.
*/
@@ -33,10 +33,10 @@
final CyNode source = edge.getSource();
final CyNode target = edge.getTarget();
final CyEdge newEdge = network.addEdge(source, target,
/* isDirected = */ false);
- network.getRow(newEdge).set(CyTableEntry.NAME,
-
network.getRow(source).get(CyTableEntry.NAME, String.class)
+ network.getRow(newEdge).set(CyNetwork.NAME,
+
network.getRow(source).get(CyNetwork.NAME, String.class)
+ " (" +
ConnectSelectedNodesTask.INTERACTION + ") "
- +
network.getRow(target).get(CyTableEntry.NAME, String.class));
+ +
network.getRow(target).get(CyNetwork.NAME, String.class));
network.getRow(newEdge).set(CyEdge.INTERACTION,
ConnectSelectedNodesTask.INTERACTION);
newEdges.add(newEdge);
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/edit/ConnectSelectedNodesTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -10,7 +10,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableUtil;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -56,9 +56,9 @@
final CyEdge newEdge =
network.addEdge(source, target, false);
newEdges.add(newEdge);
network.getRow(newEdge).set(
- CyTableEntry.NAME,
-
network.getRow(source).get(CyTableEntry.NAME, String.class) + " (" +
INTERACTION + ") "
- +
network.getRow(target).get(CyTableEntry.NAME, String.class));
+ CyNetwork.NAME,
+
network.getRow(source).get(CyNetwork.NAME, String.class) + " (" + INTERACTION +
") "
+ +
network.getRow(target).get(CyNetwork.NAME, String.class));
network.getRow(newEdge).set(CyEdge.INTERACTION, INTERACTION);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -38,7 +38,7 @@
import org.cytoscape.io.read.CyNetworkReaderManager;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.loadnetwork.NetworkURLLoader;
import org.cytoscape.view.model.CyNetworkView;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/GenerateNetworkViewsTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -35,7 +35,7 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
@@ -71,13 +71,13 @@
for (CyNetwork network : networks) {
// Use original name if exists
- String networkName =
network.getRow(network).get(CyTableEntry.NAME, String.class);
+ String networkName =
network.getRow(network).get(CyNetwork.NAME, String.class);
if(networkName == null || networkName.trim().length()
== 0) {
networkName = name;
if(networkName == null)
networkName = "? (Name is missing)";
- network.getRow(network).set(CyTableEntry.NAME,
namingUtil.getSuggestedNetworkTitle(networkName));
+ network.getRow(network).set(CyNetwork.NAME,
namingUtil.getSuggestedNetworkTitle(networkName));
}
networkManager.addNetwork(network);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/SetNetworkNameTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/SetNetworkNameTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/SetNetworkNameTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -2,7 +2,7 @@
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -25,7 +25,7 @@
if(networks == null || networks.length == 0)
throw new IllegalStateException("Could not find network
to be renamed.");
e.setProgress(0.5);
- networks[0].getRow(networks[0]).set(CyTableEntry.NAME, newName);
+ networks[0].getRow(networks[0]).set(CyNetwork.NAME, newName);
e.setProgress(1.0);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/BuildVisualStyleTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/BuildVisualStyleTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/BuildVisualStyleTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -1,7 +1,7 @@
package org.cytoscape.task.internal.quickstart.subnetworkbuilder;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -30,7 +30,7 @@
logger.debug("Network: " + targetNetwork);
logger.debug("Builder: " + util.vsBuilder);
- final String networkName =
targetNetwork.getRow(targetNetwork).get(CyTableEntry.NAME, String.class);
+ final String networkName =
targetNetwork.getRow(targetNetwork).get(CyNetwork.NAME, String.class);
tm.setProgress(0.1);
final VisualStyle style = util.vsBuilder.buildStyle(networkName + "
Style");
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/CreateSubnetworkFromSearchTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/CreateSubnetworkFromSearchTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/CreateSubnetworkFromSearchTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -8,7 +8,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.task.internal.select.SelectFirstNeighborsTask;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.Task;
@@ -53,7 +53,7 @@
boolean found = false;
List<CyNode> nodeList = target.getNodeList();
for (final CyNode node : nodeList) {
- final String nodeName =
target.getRow(node).get(CyTableEntry.NAME, String.class);
+ final String nodeName =
target.getRow(node).get(CyNetwork.NAME, String.class);
if (geneList.contains(nodeName) &&
state.getDiseaseGenes().contains(nodeName)) {
target.getRow(node).set(CyNetwork.SELECTED,
true);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/VisualStyleBuilder.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/VisualStyleBuilder.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/VisualStyleBuilder.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -3,7 +3,7 @@
import java.awt.Color;
import java.awt.Paint;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
@@ -12,6 +12,7 @@
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.mappings.DiscreteMapping;
+import org.cytoscape.model.CyNetwork;
import static
org.cytoscape.task.internal.quickstart.subnetworkbuilder.CreateSubnetworkFromSearchTask.*;
@@ -132,7 +133,7 @@
// Label Mapping.
final VisualMappingFunction<String, String> nodeLabelMapping =
ptFactory.createVisualMappingFunction(
- CyTableEntry.NAME, String.class, null,
BasicVisualLexicon.NODE_LABEL);
+ CyNetwork.NAME, String.class, null,
BasicVisualLexicon.NODE_LABEL);
newStyle.addVisualMappingFunction(nodeLabelMapping);
return newStyle;
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFromFileListTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFromFileListTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectFromFileListTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -41,7 +41,7 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.ProvidesTitle;
@@ -95,7 +95,7 @@
// Loop through all the node of the graph selecting
those in the file:
List<CyNode> nodeList = network.getNodeList();
for (final CyNode node : nodeList) {
- if
(fileNodes.contains(network.getRow(node).get(CyTableEntry.NAME, String.class)))
+ if
(fileNodes.contains(network.getRow(node).get(CyNetwork.NAME, String.class)))
network.getRow(node).set(CyNetwork.SELECTED, true);
}
tm.setProgress(0.8);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/select/SelectUtils.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -42,7 +42,7 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
final class SelectUtils {
@@ -54,9 +54,9 @@
setSelected(network,edges, select);
}
- private void setSelected(final CyNetwork network, final Collection<?
extends CyTableEntry> objects, final boolean select) {
+ private void setSelected(final CyNetwork network, final Collection<?
extends CyIdentifiable> objects, final boolean select) {
- for (final CyTableEntry nodeOrEdge : objects)
+ for (final CyIdentifiable nodeOrEdge : objects)
network.getRow(nodeOrEdge).set(CyNetwork.SELECTED,
select);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -10,7 +10,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
@@ -79,9 +79,9 @@
if (globalTable.getPrimaryKey().getType() != String.class)
throw new IllegalStateException("Local table's primary
key should be type String!");
- final CyColumn trgCol = localTable.getColumn(CyTableEntry.NAME);
+ final CyColumn trgCol = localTable.getColumn(CyNetwork.NAME);
if (trgCol != null)
- localTable.addVirtualColumns(globalTable,
CyTableEntry.NAME, false);
+ localTable.addVirtualColumns(globalTable,
CyNetwork.NAME, false);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/EditNetworkTitleTask.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -32,7 +32,7 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.session.CyNetworkNaming;
import org.cytoscape.task.AbstractNetworkTask;
import org.cytoscape.work.ProvidesTitle;
@@ -63,7 +63,7 @@
this.undoSupport = undoSupport;
this.cyNetworkManagerServiceRef = cyNetworkManagerServiceRef;
this.cyNetworkNamingServiceRef = cyNetworkNamingServiceRef;
- title = network.getRow(network).get(CyTableEntry.NAME,
String.class);
+ title = network.getRow(network).get(CyNetwork.NAME,
String.class);
}
@Override
@@ -96,9 +96,9 @@
public void run(TaskMonitor e) {
e.setProgress(0.0);
- final String oldTitle =
network.getRow(network).get(CyTableEntry.NAME, String.class);
+ final String oldTitle =
network.getRow(network).get(CyNetwork.NAME, String.class);
e.setProgress(0.3);
- network.getRow(network).set(CyTableEntry.NAME, title);
+ network.getRow(network).set(CyNetwork.NAME, title);
e.setProgress(0.6);
undoSupport.postEdit(
new NetworkTitleEdit(network, oldTitle));
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
2012-03-26 23:26:59 UTC (rev 28658)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/title/NetworkTitleEdit.java
2012-03-26 23:29:47 UTC (rev 28659)
@@ -2,7 +2,7 @@
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.work.undo.AbstractCyEdit;
@@ -19,14 +19,14 @@
}
public void redo() {
- final String savedTitle =
network.getRow(network).get(CyTableEntry.NAME, String.class);
- network.getRow(network).set(CyTableEntry.NAME, previousTitle);
+ final String savedTitle =
network.getRow(network).get(CyNetwork.NAME, String.class);
+ network.getRow(network).set(CyNetwork.NAME, previousTitle);
previousTitle = savedTitle;
}
public void undo() {
- final String savedTitle =
network.getRow(network).get(CyTableEntry.NAME, String.class);
- network.getRow(network).set(CyTableEntry.NAME, previousTitle);
+ final String savedTitle =
network.getRow(network).get(CyNetwork.NAME, String.class);
+ network.getRow(network).set(CyNetwork.NAME, previousTitle);
previousTitle = savedTitle;
}
}
--
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.
