svn commit: r1741889 - in /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider: bzip2/Bzip2FileObject.java gzip/GzipFileObject.java

[elserj]

Author: elserj
Date: Sun May  1 20:37:25 2016
New Revision: 1741889

URL: http://svn.apache.org/viewvc?rev=1741889&view=rev
Log:
[VFS-603] Restore old constructors on compressed file objects

Modified:
    
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
    
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java

Modified: 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1741889&r1=1741888&r2=1741889&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
 Sun May  1 20:37:25 2016
@@ -25,12 +25,19 @@ import org.apache.commons.compress.compr
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.provider.AbstractFileName;
 import org.apache.commons.vfs2.provider.compressed.CompressedFileFileObject;
+import org.apache.commons.vfs2.provider.compressed.CompressedFileFileSystem;
 
 /**
  * the bzip2 file.
  */
 public class Bzip2FileObject extends CompressedFileFileObject<Bzip2FileSystem>
 {
+    @Deprecated
+    protected Bzip2FileObject(final AbstractFileName name, final FileObject 
container, final CompressedFileFileSystem fs)
+    {
+        super(name, container, cast(fs));
+    }
+
     protected Bzip2FileObject(final AbstractFileName name, final FileObject 
container, final Bzip2FileSystem fs)
     {
         super(name, container, fs);
@@ -55,4 +62,11 @@ public class Bzip2FileObject extends Com
         final OutputStream os = 
getContainer().getContent().getOutputStream(false);
         return new BZip2CompressorOutputStream(os);
     }
+
+    private static Bzip2FileSystem cast(CompressedFileFileSystem fs) {
+        if (fs instanceof Bzip2FileSystem) {
+            return (Bzip2FileSystem) fs;
+        }
+        throw new IllegalArgumentException("Bzip2FileObject requires a 
Bzip2FileSystem implementation");
+    }
 }

Modified: 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
URL: 
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java?rev=1741889&r1=1741888&r2=1741889&view=diff
==============================================================================
--- 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
 (original)
+++ 
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/gzip/GzipFileObject.java
 Sun May  1 20:37:25 2016
@@ -24,12 +24,18 @@ import java.util.zip.GZIPOutputStream;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.provider.AbstractFileName;
 import org.apache.commons.vfs2.provider.compressed.CompressedFileFileObject;
+import org.apache.commons.vfs2.provider.compressed.CompressedFileFileSystem;
 
 /**
  * the gzip file.
  */
 public class GzipFileObject extends CompressedFileFileObject<GzipFileSystem>
 {
+    @Deprecated
+    protected GzipFileObject(final AbstractFileName name, final FileObject 
container, final CompressedFileFileSystem fs) {
+        super(name, container, cast(fs));
+    }
+
     protected GzipFileObject(final AbstractFileName name, final FileObject 
container, final GzipFileSystem fs)
     {
         super(name, container, fs);
@@ -48,4 +54,11 @@ public class GzipFileObject extends Comp
         final OutputStream os = 
getContainer().getContent().getOutputStream(false);
         return new GZIPOutputStream(os);
     }
+
+    private static GzipFileSystem cast(CompressedFileFileSystem fs) {
+        if (fs instanceof GzipFileSystem) {
+            return (GzipFileSystem) fs;
+        }
+        throw new IllegalArgumentException("GzipFileObject expects an instance 
of GzipFileSystem");
+    }
 }