Author: jm
Date: 2010-10-12 10:25:51 -0700 (Tue, 12 Oct 2010)
New Revision: 22212
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilter.java
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
Log:
Changed PSI-MI bundle to use StreamUtil for opening URLs
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilter.java
===================================================================
---
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilter.java
2010-10-12 17:10:57 UTC (rev 22211)
+++
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilter.java
2010-10-12 17:25:51 UTC (rev 22212)
@@ -6,12 +6,12 @@
import java.io.InputStreamReader;
import java.net.URI;
import java.net.URL;
-import java.net.URLConnection;
import java.util.HashSet;
import java.util.Set;
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.DataCategory;
+import org.cytoscape.io.util.StreamUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,13 +20,14 @@
private static final int DEFAULT_LINES_TO_CHECK = 20;
- private static final int CONNECTION_TIMEOUT = 500;
-
+ private final StreamUtil streamUtil;
private final Set<String> extensions;
private final Set<String> contentTypes;
private final String description;
- public PsiMiCyFileFilter(String description) {
+ public PsiMiCyFileFilter(String description, StreamUtil streamUtil) {
+ this.streamUtil = streamUtil;
+
extensions = new HashSet<String>();
extensions.add("xml");
@@ -52,10 +53,7 @@
}
private InputStream getInputStream(URL url) throws IOException {
- URLConnection connection = url.openConnection();
- connection.setConnectTimeout(CONNECTION_TIMEOUT);
- connection.connect();
- return connection.getInputStream();
+ return streamUtil.getInputStream(url);
}
private boolean checkHeader(InputStream stream) throws IOException {
Modified:
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-12 17:10:57 UTC (rev 22211)
+++
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-12 17:25:51 UTC (rev 22212)
@@ -16,6 +16,9 @@
<osgi:reference id="cyNetworkViewFactoryServiceRef"
interface="org.cytoscape.view.model.CyNetworkViewFactory" />
+ <osgi:reference id="streamUtilRef"
+ interface="org.cytoscape.io.util.StreamUtil" />
+
<osgi:service id="psiNetworkViewReaderFactoryService"
ref="psiMiNetworkViewTaskFactory"
interface="org.cytoscape.io.read.InputStreamTaskFactory">
<osgi:service-properties>
Modified:
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-12 17:10:57 UTC (rev 22211)
+++
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-12 17:25:51 UTC (rev 22212)
@@ -23,14 +23,17 @@
<bean id="psiMiFilter"
class="org.cytoscape.psi_mi.internal.plugin.PsiMiCyFileFilter">
<constructor-arg value="PSI-MI files (*.xml)" />
+ <constructor-arg ref="streamUtilRef" />
</bean>
<bean id="psiMi1Filter"
class="org.cytoscape.psi_mi.internal.plugin.PsiMiCyFileFilter">
<constructor-arg value="PSI-MI Level 1" />
+ <constructor-arg ref="streamUtilRef" />
</bean>
<bean id="psiMi25Filter"
class="org.cytoscape.psi_mi.internal.plugin.PsiMiCyFileFilter">
<constructor-arg value="PSI-MI Level 2.5" />
+ <constructor-arg ref="streamUtilRef" />
</bean>
<bean id="psiMiNetworkViewTaskFactory"
class="org.cytoscape.psi_mi.internal.plugin.PsiMiNetworkViewTaskFactory">
Modified:
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
===================================================================
---
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
2010-10-12 17:10:57 UTC (rev 22211)
+++
core3/psi-mi-impl/trunk/src/test/java/org/cytoscape/psi_mi/internal/plugin/PsiMiCyFileFilterTest.java
2010-10-12 17:25:51 UTC (rev 22212)
@@ -5,18 +5,41 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.DataCategory;
+import org.cytoscape.io.util.StreamUtil;
import org.junit.Before;
import org.junit.Test;
public class PsiMiCyFileFilterTest {
private CyFileFilter filter;
+
@Before
public void setUp() {
- filter = new PsiMiCyFileFilter("PSI");
+ StreamUtil streamUtil = new StreamUtil() {
+
+ @Override
+ public URLConnection getURLConnection(URL source)
throws IOException {
+ return null;
+ }
+
+ @Override
+ public InputStream getInputStream(URL source) throws
IOException {
+ return source.openStream();
+ }
+
+ @Override
+ public InputStream getBasicInputStream(URL source)
throws IOException {
+ return null;
+ }
+ };
+ filter = new PsiMiCyFileFilter("PSI", streamUtil);
}
@Test
--
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.
