You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/27 14:48:57 UTC

svn commit: r225504 - in /maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver: MavenArchiveConfiguration.java MavenArchiver.java

Author: brett
Date: Wed Jul 27 05:48:52 2005
New Revision: 225504

URL: http://svn.apache.org/viewcvs?rev=225504&view=rev
Log:
PR: MNG-642
add getters/setters for all fields so they can be programmatically manipulated.
convert to native types rather than using strings.

Modified:
    maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
    maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java

Modified: maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java?rev=225504&r1=225503&r2=225504&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java (original)
+++ maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java Wed Jul 27 05:48:52 2005
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+import java.io.File;
+
 /**
  * Capture common archive configuration.
  *
@@ -25,34 +27,25 @@
  */
 public class MavenArchiveConfiguration
 {
-    /**
-     * @todo boolean instead
-     */
-    private String compress;
-
-    /**
-     * @todo boolean instead
-     */
-    private String index;
-
-    /**
-     * @todo File instead
-     */
-    private String manifestFile;
+    private boolean compress = true;
+
+    private boolean index;
+
+    private File manifestFile;
 
     private ManifestConfiguration manifest;
 
     public boolean isCompress()
     {
-        return compress != null ? Boolean.valueOf( compress ).booleanValue() : true;
+        return compress;
     }
 
     public boolean isIndex()
     {
-        return index != null ? Boolean.valueOf( index ).booleanValue() : false;
+        return index;
     }
 
-    public String getManifestFile()
+    public File getManifestFile()
     {
         return manifestFile;
     }
@@ -64,5 +57,25 @@
             manifest = new ManifestConfiguration();
         }
         return manifest;
+    }
+
+    public void setCompress( boolean compress )
+    {
+        this.compress = compress;
+    }
+
+    public void setIndex( boolean index )
+    {
+        this.index = index;
+    }
+
+    public void setManifestFile( File manifestFile )
+    {
+        this.manifestFile = manifestFile;
+    }
+
+    public void setManifest( ManifestConfiguration manifest )
+    {
+        this.manifest = manifest;
     }
 }

Modified: maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=225504&r1=225503&r2=225504&view=diff
==============================================================================
--- maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java (original)
+++ maven/components/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java Wed Jul 27 05:48:52 2005
@@ -249,11 +249,11 @@
         // Create the manifest
         // ----------------------------------------------------------------------
 
-        String manifestFile = archiveConfiguration.getManifestFile();
+        File manifestFile = archiveConfiguration.getManifestFile();
 
-        if ( manifestFile != null && !"".equals( manifestFile ) )
+        if ( manifestFile != null )
         {
-            archiver.setManifest( new File( manifestFile ) );
+            archiver.setManifest( manifestFile );
         }
 
         Manifest manifest = getManifest( project, archiveConfiguration.getManifest() );



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org