Author: pwang
Date: 2011-12-06 16:02:46 -0800 (Tue, 06 Dec 2011)
New Revision: 27722
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/FilterPlugin.java
Log:
Fixed bug#512
Modified:
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/FilterPlugin.java
===================================================================
---
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/FilterPlugin.java
2011-12-07 00:01:42 UTC (rev 27721)
+++
core3/impl/trunk/filter-impl/src/main/java/org/cytoscape/filter/internal/filters/FilterPlugin.java
2011-12-07 00:02:46 UTC (rev 27722)
@@ -42,6 +42,8 @@
import org.cytoscape.application.swing.CySwingApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.InputStream;
+import java.io.InputStreamReader;
/**
@@ -100,22 +102,24 @@
public void restoreInitState() {
// // TODO: Port this
// final File globalFilterFile =
CytoscapeInit.getConfigFile("filters.props");
-// int[] loadCount =
filterIO.getFilterVectFromPropFile(globalFilterFile);
+ int[] loadCount = {0,0};
//filterIO.getFilterVectFromPropFile(globalFilterFile);
// logger.debug("FilterPlugin: load " + loadCount[1] + " of " +
loadCount[0] + " filters from filters.prop");
//
// if (loadCount[1] == 0) {
-// final String DEFAULT_FILTERS_FILENAME =
"/default_filters.props";
-// final InputStream inputStream =
FilterPlugin.class.getResourceAsStream(DEFAULT_FILTERS_FILENAME);
-// if (inputStream == null) {
-// System.err.println("FilterPlugin: Failed to
read default filters from \""
-// + DEFAULT_FILTERS_FILENAME +
"\" in the plugin's jar file!");
-// return;
-// }
-//
-// final InputStreamReader inputStreamReader = new
InputStreamReader(inputStream);
-// loadCount =
filterIO.getFilterVectFromPropFile(inputStreamReader);
-// logger.debug("FilterPlugin: load " + loadCount[1] + "
of " + loadCount[0]
-// + " filters from " +
DEFAULT_FILTERS_FILENAME);
+ final String DEFAULT_FILTERS_FILENAME =
"/default_filters.props";
+ final InputStream inputStream =
FilterPlugin.class.getResourceAsStream(DEFAULT_FILTERS_FILENAME);
+
+ if (inputStream == null) {
+ System.err.println("FilterPlugin: Failed to
read default filters from \""
+ + DEFAULT_FILTERS_FILENAME +
"\" in the plugin's jar file!");
+ return;
+ }
+
+ final InputStreamReader inputStreamReader = new
InputStreamReader(inputStream);
+ loadCount =
filterIO.getFilterVectFromPropFile(inputStreamReader);
+
+ logger.debug("FilterPlugin: load " + loadCount[1] + "
of " + loadCount[0]
+ + " filters from " +
DEFAULT_FILTERS_FILENAME);
// }
}
--
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.
