diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties index 63c589d21..1837ec7f7 100644 --- a/src/main/org/apache/tools/ant/types/defaults.properties +++ b/src/main/org/apache/tools/ant/types/defaults.properties @@ -72,6 +72,7 @@ intersect=org.apache.tools.ant.types.resources.Intersect sort=org.apache.tools.ant.types.resources.Sort resources=org.apache.tools.ant.types.resources.Resources allbutfirst=org.apache.tools.ant.types.resources.AllButFirst +allbutlast=org.apache.tools.ant.types.resources.AllButLast first=org.apache.tools.ant.types.resources.First last=org.apache.tools.ant.types.resources.Last tarfileset=org.apache.tools.ant.types.TarFileSet diff --git a/src/main/org/apache/tools/ant/types/resources/AllButLast.java b/src/main/org/apache/tools/ant/types/resources/AllButLast.java new file mode 100644 index 000000000..a1e6a984b --- /dev/null +++ b/src/main/org/apache/tools/ant/types/resources/AllButLast.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.tools.ant.types.resources; + +import java.util.Collection; +import java.util.List; + +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.util.CollectionUtils; + +/** + * ResourceCollection that contains all resources of another + * collection except for the last count elements, a la + * the UNIX head command with parameter -n -count. + * @since Ant 1.9.5 + */ +public class AllButLast extends SizeLimitCollection { + + /** + * Take all elements except for the last count elements. + * @return a Collection of Resources. + */ + protected Collection getCollection() { + int ct = getValidCount(); + List result = + (List) CollectionUtils.asCollection(getResourceCollection() + .iterator()); + return result.subList(0, result.size() - ct); + } + + @Override + public synchronized int size() { + int sz = getResourceCollection().size(); + int ct = getValidCount(); + return sz > ct ? sz - ct : 0; + } + +} diff --git a/src/tests/antunit/types/resources/first-last-test.xml b/src/tests/antunit/types/resources/first-last-test.xml index 46273c1d0..e7fc831bb 100644 --- a/src/tests/antunit/types/resources/first-last-test.xml +++ b/src/tests/antunit/types/resources/first-last-test.xml @@ -96,9 +96,6 @@ - - - @@ -110,9 +107,6 @@ - - - @@ -221,4 +215,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +