You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2009/07/15 16:13:37 UTC
svn commit: r794274 -
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
Author: bodewig
Date: Wed Jul 15 14:13:36 2009
New Revision: 794274
URL: http://svn.apache.org/viewvc?rev=794274&view=rev
Log:
extract method
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?rev=794274&r1=794273&r2=794274&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Wed Jul 15 14:13:36 2009
@@ -1371,29 +1371,8 @@
}
}
- Resource[] resources = selectFileResources(initialResources[i]);
- newerResources[i] =
- ResourceUtils.selectOutOfDateSources(this,
- resources,
- myMapper,
- getZipScanner());
- if (!doFilesonly) {
- Union u = new Union();
- u.addAll(Arrays
- .asList(selectDirectoryResources(initialResources[i])));
- ResourceCollection rc =
- ResourceUtils.selectSources(this, u,
- myMapper,
- getZipScanner(),
- MISSING_DIR_PROVIDER);
- if (rc.size() > 0) {
- ArrayList newer = new ArrayList();
- newer.addAll(Arrays.asList(((Union) rc).listResources()));
- newer.addAll(Arrays.asList(newerResources[i]));
- newerResources[i] =
- (Resource[]) newer.toArray(newerResources[i]);
- }
- }
+ newerResources[i] = selectOutOfDateResources(initialResources[i],
+ myMapper);
needsUpdate = needsUpdate || (newerResources[i].length > 0);
if (needsUpdate && !doUpdate) {
@@ -1477,29 +1456,8 @@
}
}
- Resource[] rs = selectFileResources(initialResources[i]);
- newerResources[i] =
- ResourceUtils.selectOutOfDateSources(this,
- rs,
- new IdentityMapper(),
- getZipScanner());
- if (!doFilesonly) {
- Union u = new Union();
- u.addAll(Arrays
- .asList(selectDirectoryResources(initialResources[i])));
- ResourceCollection rc =
- ResourceUtils.selectSources(this, u,
- new IdentityMapper(),
- getZipScanner(),
- MISSING_DIR_PROVIDER);
- if (rc.size() > 0) {
- ArrayList newer = new ArrayList();
- newer.addAll(Arrays.asList(((Union) rc).listResources()));
- newer.addAll(Arrays.asList(newerResources[i]));
- newerResources[i] =
- (Resource[]) newer.toArray(newerResources[i]);
- }
- }
+ newerResources[i] = selectOutOfDateResources(initialResources[i],
+ new IdentityMapper());
needsUpdate = needsUpdate || (newerResources[i].length > 0);
if (needsUpdate && !doUpdate) {
@@ -1517,6 +1475,29 @@
return new ArchiveState(needsUpdate, newerResources);
}
+ private Resource[] selectOutOfDateResources(Resource[] initial,
+ FileNameMapper mapper) {
+ Resource[] rs = selectFileResources(initial);
+ Resource[] result =
+ ResourceUtils.selectOutOfDateSources(this, rs, mapper,
+ getZipScanner());
+ if (!doFilesonly) {
+ Union u = new Union();
+ u.addAll(Arrays.asList(selectDirectoryResources(initial)));
+ ResourceCollection rc =
+ ResourceUtils.selectSources(this, u, mapper,
+ getZipScanner(),
+ MISSING_DIR_PROVIDER);
+ if (rc.size() > 0) {
+ ArrayList newer = new ArrayList();
+ newer.addAll(Arrays.asList(((Union) rc).listResources()));
+ newer.addAll(Arrays.asList(result));
+ result = (Resource[]) newer.toArray(result);
+ }
+ }
+ return result;
+ }
+
/**
* Fetch all included and not excluded resources from the sets.
*