[jboss-svn-commits] JBoss Common SVN: r3662 - in shrinkwrap/trunk: impl-base/src/main/java/org/jboss/shrinkwrap/impl/base and 2 other directories.

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

Author: aslak
Date: 2009-11-11 05:23:26 -0500 (Wed, 11 Nov 2009)
New Revision: 3662

Modified:
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
Log:
SHRINKWRAP-61 Switched Path and Archive argument position

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java	2009-11-11 10:14:41 UTC (rev 3661)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java	2009-11-11 10:23:26 UTC (rev 3662)
@@ -140,12 +140,12 @@
     * Merge the contents from an existing archive in a specific path 
     * without maintaining the archive name in the context path.
     * 
+    * @param source Archive to add contents from
     * @param path Path to add contents to
-    * @param source Archive to add contents from
     * @return  
     * @throws IllegalArgumentException If the path or existing archive is not specified
     */
-   T merge(Path path, Archive<?> source) throws IllegalArgumentException;
+   T merge(Archive<?> source, Path path) throws IllegalArgumentException;
 
    /**
     * Returns a multiline "ls -l"-equse output of the contents of

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java	2009-11-11 10:14:41 UTC (rev 3661)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java	2009-11-11 10:23:26 UTC (rev 3662)
@@ -178,7 +178,7 @@
    @Override
    public T merge(final Archive<?> source) throws IllegalArgumentException
    {
-      return merge(new BasicPath(), source);
+      return merge(source, new BasicPath());
    }
 
    /**
@@ -186,11 +186,11 @@
     * @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Archive)
     */
    @Override
-   public T merge(final Path path, final Archive<?> source) throws IllegalArgumentException
+   public T merge(final Archive<?> source, final Path path) throws IllegalArgumentException
    {
       // Precondition checks
+      Validate.notNull(source, "No source archive was specified");
       Validate.notNull(path, "No path was specified");
-      Validate.notNull(source, "No source archive was specified");
 
       // Get existing contents from source archive
       final Map<Path, Asset> sourceContent = source.getContent();

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-11-11 10:14:41 UTC (rev 3661)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-11-11 10:23:26 UTC (rev 3662)
@@ -127,9 +127,9 @@
    }
    
    @Override
-   public T merge(Path path, Archive<?> source) throws IllegalArgumentException
+   public T merge(Archive<?> source, Path path) throws IllegalArgumentException
    {
-      archive.merge(path, source);
+      archive.merge(source, path);
       return covarientReturn();
    }
    

Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java	2009-11-11 10:14:41 UTC (rev 3661)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java	2009-11-11 10:23:26 UTC (rev 3662)
@@ -524,7 +524,7 @@
 
       Path baseLocation = new BasicPath("somewhere");
 
-      archive.merge(baseLocation, sourceArchive);
+      archive.merge(sourceArchive, baseLocation);
 
       Path expectedPath = new BasicPath(baseLocation, location);
       Path expectedPathTwo = new BasicPath(baseLocation, locationTwo);
@@ -546,7 +546,7 @@
       Archive<T> archive = getArchive();
       try
       {
-         archive.merge(null, createNewArchive());
+         archive.merge(createNewArchive(), null);
          Assert.fail("Should have throw an IllegalArgumentException");
       }
       catch (IllegalArgumentException expectedException)