summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-27 04:44:26 (EDT)
committerEike Stepper2007-08-27 04:44:26 (EDT)
commit0cada8e16ba7b245ef0f59d1ea0af001a4669545 (patch)
treee021a39c28e6234c5ebf001dd0452f14c7bd070c
parent02188ac36ba9c2155dd08957a26df4268c0342aa (diff)
downloadcdo-0cada8e16ba7b245ef0f59d1ea0af001a4669545.zip
cdo-0cada8e16ba7b245ef0f59d1ea0af001a4669545.tar.gz
cdo-0cada8e16ba7b245ef0f59d1ea0af001a4669545.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml2
-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 85d5f78..c121c3a 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 435bab1..3a51c01 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 c0390bf..5abf818 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);
}