Author: jm
Date: 2011-07-06 12:09:38 -0700 (Wed, 06 Jul 2011)
New Revision: 26068
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/CompositeFilter.java
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/FilterIO.java
Log:
fixes #288: Changed CompositeFilter.toString() so it returns the filter's label
instead of its serialized form. Added toSerializedForm() for old toString()
behaviour.
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/CompositeFilter.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/CompositeFilter.java
2011-07-06 17:56:21 UTC (rev 26067)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/CompositeFilter.java
2011-07-06 19:09:38 UTC (rev 26068)
@@ -438,8 +438,11 @@
/**
* @return the string represention of this Filter.
*/
- public String toString()
- {
+ public String toString() {
+ return getLabel();
+ }
+
+ public String toSerializedForm() {
String retStr = "<Composite>\n";
retStr = retStr + "name=" + name + "\n";
@@ -470,7 +473,7 @@
}
CompositeFilter theOtherFilter = (CompositeFilter) other_object;
- if
(theOtherFilter.toString().equalsIgnoreCase(this.toString())) {
+ if
(theOtherFilter.toSerializedForm().equalsIgnoreCase(this.toSerializedForm())) {
return true;
}
return false;
Modified:
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/FilterIO.java
===================================================================
---
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/FilterIO.java
2011-07-06 17:56:21 UTC (rev 26067)
+++
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/FilterIO.java
2011-07-06 19:09:38 UTC (rev 26068)
@@ -506,7 +506,7 @@
if (globalFilters != null) {
for (int i = 0; i < globalFilters.length; i++) {
CompositeFilter theFilter = (CompositeFilter)
globalFilters[i];
- writer.write(theFilter.toString());
+ writer.write(theFilter.toSerializedForm());
writer.newLine();
}
}
@@ -572,7 +572,7 @@
for (int i = 0; i < sessionFilters.length; i++) {
CompositeFilter theFilter = (CompositeFilter)
sessionFilters[i];
- writer.write(theFilter.toString());
+ writer.write(theFilter.toSerializedForm());
writer.newLine();
}
}
--
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.
