[jboss-cvs] JBossAS SVN: r83410 - in projects/vfs/trunk/src: test/java/org/jboss/test/virtual/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-01-26 09:27:56 -0500 (Mon, 26 Jan 2009)
New Revision: 83410

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java
Log:
[JBVFS-88]; fix handler replace.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/AbstractCopyMechanism.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -102,7 +102,10 @@
     * @return true if needs replacement
     * @throws IOException for any error
     */
-   protected abstract boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException;
+   protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
+   {
+      return true;
+   }
 
    /**
     * Unwrap the handler from possible delegate handler.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/ExplodedCopyMechanism.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -44,9 +44,4 @@
    {
       return handler instanceof FileHandler || handler.isLeaf();
    }
-
-   protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
-   {
-      return false;
-   }
 }
\ No newline at end of file

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/TempCopyMechanism.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -68,9 +68,4 @@
 
       return super.copy(guidDir, handler);
    }
-
-   protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
-   {
-      return false;
-   }
 }
\ No newline at end of file

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/copy/UnpackCopyMechanism.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -43,9 +43,4 @@
    {
       return handler.isNested() == false;
    }
-
-   protected boolean replaceOldHandler(VirtualFileHandler parent, VirtualFileHandler oldHandler, VirtualFileHandler newHandler) throws IOException
-   {
-      return true;
-   }
 }
\ No newline at end of file

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/CopyTest.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -81,7 +81,10 @@
       assertNotNull(replacement.findChild("jar2.jar"));
    }
 
-   protected abstract void assertTopLevelParent(VirtualFile originalParent, VirtualFile replacementParent) throws Exception;
+   protected void assertTopLevelParent(VirtualFile originalParent, VirtualFile replacementParent) throws Exception
+   {
+      assertEquals(originalParent, replacementParent);
+   }
 
    public void testUnpackTopLevel() throws Throwable
    {
@@ -165,7 +168,7 @@
    protected void assertExplodedReplacement(VirtualFile original, VirtualFile replacement) throws Exception
    {
       assertReplacement(original, replacement);
-      assertNull(replacement.getParent());
+      assertNotNull(replacement.getParent());
    }
 
    protected void assertReplacement(VirtualFile original, VirtualFile replacement) throws Exception

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/DetachedCopyTest.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -50,7 +50,7 @@
    protected void assertTopLevel(VirtualFile original, VirtualFile replacement) throws Exception
    {
       assertReplacement(original, replacement, isExploded());
-      assertNull(replacement.getParent());
+      assertNotNull(replacement.getParent());
    }
 
    protected void assertNestedLevel(VirtualFile original, VirtualFile replacement) throws Exception
@@ -58,11 +58,6 @@
       assertExplodedReplacement(original, replacement);
    }
 
-   protected void assertTopLevelParent(VirtualFile originalParent, VirtualFile replacementParent) throws Exception
-   {
-      assertNull(replacementParent);
-   }
-
    protected void assertOnURI(VirtualFile original, VirtualFile replacement) throws Exception
    {
       assertReplacement(original, replacement);

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java	2009-01-26 14:04:02 UTC (rev 83409)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java	2009-01-26 14:27:56 UTC (rev 83410)
@@ -61,9 +61,4 @@
    {
       assertUnpackedReplacement(original, replacement);
    }
-
-   protected void assertTopLevelParent(VirtualFile originalParent, VirtualFile replacementParent) throws Exception
-   {
-      assertEquals(originalParent, replacementParent);
-   }
 }
\ No newline at end of file