Author: bodewig
Date: Fri Aug 21 19:28:40 2009
New Revision: 806691
URL: http://svn.apache.org/viewvc?rev=806691&view=rev
Log:
don't invoke virtual methods in constructor
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArResource.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArResource.java?rev=806691&r1=806690&r2=806691&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ArResource.java
Fri Aug 21 19:28:40 2009
@@ -26,7 +26,7 @@
/**
* A Resource representation of an entry in a ar archive.
*/
-public class ArResource extends CommonsCompressArchiveResource {
+public final class ArResource extends CommonsCompressArchiveResource {
/**
* Default constructor.
@@ -43,6 +43,7 @@
*/
public ArResource(File a, ArArchiveEntry e) {
super(new ArStreamFactory(), "ar", a, e);
+ setEntry(e);
}
/**
@@ -53,6 +54,7 @@
*/
public ArResource(Resource a, ArArchiveEntry e) {
super(new ArStreamFactory(), "ar", a, e);
+ setEntry(e);
}
}
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java?rev=806691&r1=806690&r2=806691&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
Fri Aug 21 19:28:40 2009
@@ -67,7 +67,6 @@
super(a, true);
this.factory = factory;
this.archiveType = archiveType;
- setEntry(e);
}
/**
@@ -82,7 +81,6 @@
super(a, true);
this.factory = factory;
this.archiveType = archiveType;
- setEntry(e);
}
/**
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java?rev=806691&r1=806690&r2=806691&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
Fri Aug 21 19:28:40 2009
@@ -26,7 +26,7 @@
/**
* A Resource representation of an entry in a cpio archive.
*/
-public class CpioResource extends CommonsCompressArchiveResource {
+public final class CpioResource extends CommonsCompressArchiveResource {
/**
* Default constructor.
@@ -43,6 +43,7 @@
*/
public CpioResource(File a, CpioArchiveEntry e) {
super(new CpioStreamFactory(), "cpio", a, e);
+ setEntry(e);
}
/**
@@ -53,6 +54,7 @@
*/
public CpioResource(Resource a, CpioArchiveEntry e) {
super(new CpioStreamFactory(), "cpio", a, e);
+ setEntry(e);
}
}
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java?rev=806691&r1=806690&r2=806691&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/TarResource.java
Fri Aug 21 19:28:40 2009
@@ -27,7 +27,7 @@
/**
* A Resource representation of an entry in a tar archive.
*/
-public class TarResource extends CommonsCompressArchiveResource {
+public final class TarResource extends CommonsCompressArchiveResource {
private String userName = "";
private String groupName = "";
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java?rev=806691&r1=806690&r2=806691&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/ZipResource.java
Fri Aug 21 19:28:40 2009
@@ -38,7 +38,7 @@
/**
* A Resource representation of an entry in a zipfile.
*/
-public class ZipResource extends CommonsCompressArchiveResource {
+public final class ZipResource extends CommonsCompressArchiveResource {
private ZipExtraField[] extras;
@@ -59,6 +59,7 @@
public ZipResource(File z, String enc, ZipArchiveEntry e) {
super(new ZipStreamFactory(), "zip", z, e);
setEncoding(enc);
+ setEntry(e);
}
/**
@@ -71,6 +72,7 @@
public ZipResource(Resource z, String enc, ZipArchiveEntry e) {
super(new ZipStreamFactory(), "zip", z, e);
setEncoding(enc);
+ setEntry(e);
}
/**
