Author: kono
Date: 2012-09-14 11:51:12 -0700 (Fri, 14 Sep 2012)
New Revision: 30368
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
Log:
Hard-coded string moved to public static string.
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
2012-09-14 18:43:47 UTC (rev 30367)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/AbstractNetworkReader.java
2012-09-14 18:51:12 UTC (rev 30368)
@@ -23,6 +23,11 @@
import org.cytoscape.model.subnetwork.CySubNetwork;
public abstract class AbstractNetworkReader extends AbstractTask implements
CyNetworkReader {
+
+ /**
+ * If this option is selected, reader should create new CyRootNetwork.
+ */
+ public static final String CRERATE_NEW_COLLECTION_STRING ="Create new
network collection";
protected CyNetwork[] cyNetworks;
@@ -61,11 +66,11 @@
Iterator<String> it = name2RootMap.keySet().iterator();
final List<Object> networkList = new ArrayList<Object>();
- networkList.add("new Collection");
+ networkList.add(CRERATE_NEW_COLLECTION_STRING);
- while (it.hasNext()){
- networkList.add(it.next());
- }
+ while (it.hasNext())
+ networkList.add(it.next());
+
networkCollection = new
ListSingleSelection<Object>(networkList);
}
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
2012-09-14 18:43:47 UTC (rev 30367)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkReader.java
2012-09-14 18:51:12 UTC (rev 30368)
@@ -197,7 +197,7 @@
taskMonitor.setProgress(0.3);
String networkCollectionName =
networkCollection.getSelectedValue().toString();
- if (networkCollectionName.equalsIgnoreCase("new Collection")){
+ if
(networkCollectionName.equalsIgnoreCase(CRERATE_NEW_COLLECTION_STRING)){
network = cyNetworkFactory.createNetwork();
}
else {
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
2012-09-14 18:43:47 UTC (rev 30367)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkReader.java
2012-09-14 18:51:12 UTC (rev 30368)
@@ -102,7 +102,7 @@
String networkCollectionName =
networkCollection.getSelectedValue().toString();
CyNetwork network;
- if (networkCollectionName.equalsIgnoreCase("new Collection")){
+ if
(networkCollectionName.equalsIgnoreCase(CRERATE_NEW_COLLECTION_STRING)){
network = cyNetworkFactory.createNetwork();
}
else {
--
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.
