Author: mes
Date: 2010-10-06 23:23:49 -0700 (Wed, 06 Oct 2010)
New Revision: 22178
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkWriterFactory.java
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiWriter.java
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
updated to reflect changes to io-api
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkWriterFactory.java
===================================================================
---
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkWriterFactory.java
2010-10-07 00:42:33 UTC (rev 22177)
+++
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiNetworkWriterFactory.java
2010-10-07 06:23:49 UTC (rev 22178)
@@ -1,18 +1,19 @@
package org.cytoscape.psi_mi.internal.plugin;
-import java.io.File;
+import java.io.OutputStream;
import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.CyNetworkWriterFactory;
+import org.cytoscape.io.write.CyNetworkViewWriterFactory;
import org.cytoscape.io.write.CyWriter;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.view.model.CyNetworkView;
-public class PsiMiNetworkWriterFactory implements CyNetworkWriterFactory {
+public class PsiMiNetworkWriterFactory implements CyNetworkViewWriterFactory {
private final SchemaVersion version;
private final CyFileFilter filter;
- private File file;
+ private OutputStream os;
private CyNetwork network;
public PsiMiNetworkWriterFactory(SchemaVersion version, CyFileFilter
filter) {
@@ -21,13 +22,13 @@
}
@Override
- public void setOutputFile(File file) {
- this.file = file;
+ public void setOutputStream(OutputStream os) {
+ this.os = os;
}
@Override
public CyWriter getWriter() {
- return new PsiMiWriter(file, network, version);
+ return new PsiMiWriter(os, network, version);
}
@Override
@@ -36,8 +37,8 @@
}
@Override
- public void setNetwork(CyNetwork network) {
- this.network = network;
+ public void setNetworkView(CyNetworkView view) {
+ this.network = view.getModel();
}
}
Modified:
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiWriter.java
===================================================================
---
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiWriter.java
2010-10-07 00:42:33 UTC (rev 22177)
+++
core3/psi-mi-impl/trunk/src/main/java/org/cytoscape/psi_mi/internal/plugin/PsiMiWriter.java
2010-10-07 06:23:49 UTC (rev 22178)
@@ -1,7 +1,6 @@
package org.cytoscape.psi_mi.internal.plugin;
-import java.io.File;
-import java.io.FileWriter;
+import java.io.OutputStream;
import java.util.List;
import javax.xml.bind.JAXBContext;
@@ -19,12 +18,12 @@
public class PsiMiWriter implements CyWriter {
- private final File file;
+ private final OutputStream outputStream;
private final CyNetwork network;
private final SchemaVersion version;
- public PsiMiWriter(File file, CyNetwork network, SchemaVersion version)
{
- this.file = file;
+ public PsiMiWriter(OutputStream outputStream, CyNetwork network,
SchemaVersion version) {
+ this.outputStream = outputStream;
this.network = network;
this.version = version;
}
@@ -53,12 +52,7 @@
schemaMapper.doMapping();
Object model = schemaMapper.getModel();
Marshaller marshaller =
createMarshaller(schemaMapper.getSchemaNamespace());
- FileWriter writer = new FileWriter(file);
- try {
- marshaller.marshal(model, writer);
- } finally {
- writer.close();
- }
+ marshaller.marshal(model, outputStream);
}
@Override
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-07 00:42:33 UTC (rev 22177)
+++
core3/psi-mi-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-07 06:23:49 UTC (rev 22178)
@@ -26,10 +26,10 @@
</osgi:service>
<osgi:service id="psiMi1NetworkViewWriterFactoryService"
ref="psiMi1NetworkViewWriterFactory"
- interface="org.cytoscape.io.write.CyNetworkWriterFactory">
+ interface="org.cytoscape.io.write.CyNetworkViewWriterFactory">
</osgi:service>
<osgi:service id="psiMi25NetworkViewWriterFactoryService"
ref="psiMi25NetworkViewWriterFactory"
- interface="org.cytoscape.io.write.CyNetworkWriterFactory">
+ interface="org.cytoscape.io.write.CyNetworkViewWriterFactory">
</osgi:service>
</beans>
--
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.
