diff options
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/plugin.xml | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPStreamWrapper.java) | 31 | ||||
-rw-r--r-- | plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/GZIPStreamWrapperInjector.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ZIPStreamWrapperInjector.java) | 8 |
3 files changed, 28 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml index 85d5f78cc6..c121c3ac93 100644 --- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml @@ -4,7 +4,7 @@ <plugin> <extension point="org.eclipse.net4j.util.elementProcessors"> - <elementProcessor class="org.eclipse.emf.cdo.protocol.util.CDOZIPStreamWrapperInjector"/> + <elementProcessor class="org.eclipse.emf.cdo.protocol.util.CDOGZIPStreamWrapperInjector"/> </extension> <extension diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java index 435bab1a18..3a51c01bda 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ZIPStreamWrapper.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java @@ -10,37 +10,52 @@ **************************************************************************/ package org.eclipse.net4j.util.io; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.zip.ZipInputStream; -import java.util.zip.ZipOutputStream; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; /** * @author Eike Stepper */ -public class ZIPStreamWrapper implements IStreamWrapper +public class GZIPStreamWrapper implements IStreamWrapper { - public ZIPStreamWrapper() + public GZIPStreamWrapper() { } public InputStream wrapInputStream(InputStream in) { - if (in instanceof ZipInputStream) + if (in instanceof GZIPInputStream) { return in; } - return new ZipInputStream(in); + try + { + return new GZIPInputStream(in); + } + catch (IOException ex) + { + throw new IORuntimeException(ex); + } } public OutputStream wrapOutputStream(OutputStream out) { - if (out instanceof ZipOutputStream) + if (out instanceof GZIPOutputStream) { return out; } - return new ZipOutputStream(out); + try + { + return new GZIPOutputStream(out); + } + catch (IOException ex) + { + throw new IORuntimeException(ex); + } } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ZIPStreamWrapperInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/GZIPStreamWrapperInjector.java index c0390bfa1f..5abf818e7c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/ZIPStreamWrapperInjector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/GZIPStreamWrapperInjector.java @@ -10,16 +10,16 @@ **************************************************************************/ package org.eclipse.net4j.signal; -import org.eclipse.net4j.util.io.ZIPStreamWrapper; +import org.eclipse.net4j.util.io.GZIPStreamWrapper; /** * @author Eike Stepper */ -public class ZIPStreamWrapperInjector extends StreamWrapperInjector +public class GZIPStreamWrapperInjector extends StreamWrapperInjector { - public static final ZIPStreamWrapper STREAM_WRAPPER = new ZIPStreamWrapper(); + public static final GZIPStreamWrapper STREAM_WRAPPER = new GZIPStreamWrapper(); - public ZIPStreamWrapperInjector(String protocolID) + public GZIPStreamWrapperInjector(String protocolID) { super(protocolID, STREAM_WRAPPER); } |