Author: clopes
Date: 2012-10-04 14:22:22 -0700 (Thu, 04 Oct 2012)
New Revision: 30608
Modified:
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/handler/HandleNode.java
Log:
Fixed #1502 (Error opening session twice): Patching Beta1 branch
Modified:
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
===================================================================
---
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
2012-10-04 21:01:35 UTC (rev 30607)
+++
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
2012-10-04 21:22:22 UTC (rev 30608)
@@ -10,6 +10,7 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.io.internal.util.ReadUtils;
+import org.cytoscape.io.internal.util.session.SessionUtil;
import org.cytoscape.io.read.CyNetworkReader;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
@@ -156,21 +157,22 @@
rootNetworkList = new ListSingleSelection<String>(rootNames);
rootNetworkList.setSelectedValue(rootNames.get(0));
- //
- if(this.cyApplicationManager.getSelectedNetworks() != null &&
this.cyApplicationManager.getSelectedNetworks().size() >0){
- CyNetwork selectedNetwork =
this.cyApplicationManager.getSelectedNetworks().get(0);
- String rootName = "";
- if (selectedNetwork instanceof CySubNetwork){
- CySubNetwork subnet = (CySubNetwork)
selectedNetwork;
- CyRootNetwork rootNet = subnet.getRootNetwork();
- rootName =
rootNet.getRow(rootNet).get(CyNetwork.NAME, String.class);
+ if (!SessionUtil.isReadingSessionFile()) {
+ if(this.cyApplicationManager.getSelectedNetworks() !=
null && this.cyApplicationManager.getSelectedNetworks().size() >0){
+ CyNetwork selectedNetwork =
this.cyApplicationManager.getSelectedNetworks().get(0);
+ String rootName = "";
+ if (selectedNetwork instanceof CySubNetwork){
+ CySubNetwork subnet = (CySubNetwork)
selectedNetwork;
+ CyRootNetwork rootNet =
subnet.getRootNetwork();
+ rootName =
rootNet.getRow(rootNet).get(CyNetwork.NAME, String.class);
+ }
+ else {
+ // it is a root network
+ rootName =
selectedNetwork.getRow(selectedNetwork).get(CyNetwork.NAME, String.class);
+ }
+
+ rootNetworkList.setSelectedValue(rootName);
}
- else {
- // it is a root network
- rootName =
selectedNetwork.getRow(selectedNetwork).get(CyNetwork.NAME, String.class);
- }
-
- rootNetworkList.setSelectedValue(rootName);
}
// initialize target attribute list
Modified:
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/handler/HandleNode.java
===================================================================
---
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/handler/HandleNode.java
2012-10-04 21:01:35 UTC (rev 30607)
+++
core3/impl/branches/user-beta1/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/xgmml/handler/HandleNode.java
2012-10-04 21:22:22 UTC (rev 30608)
@@ -61,12 +61,13 @@
manager.addNode(node, label, (CySubNetwork)
curNet);
if ( label != null && (!manager.isSessionFormat() ||
manager.getDocumentVersion() < 3.0) ) {
-
- if (!curNet.containsNode(node) && curNet
instanceof CySubNetwork){
- // The node should be node in root
network, it does not exist in current subnetwork yet
- CySubNetwork subnet = (CySubNetwork)
curNet;
- subnet.addNode(node);
- node = subnet.getNode(node.getSUID());
+ if (!manager.isSessionFormat()) {
+ if (!curNet.containsNode(node) &&
curNet instanceof CySubNetwork){
+ // The node should be node in
root network, it does not exist in current subnetwork yet
+ CySubNetwork subnet =
(CySubNetwork) curNet;
+ subnet.addNode(node);
+ node =
subnet.getNode(node.getSUID());
+ }
}
curNet.getRow(node).set(CyNetwork.NAME, label);
--
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.
