From 989ca3b7879d23abc16ce6b48335c2e7b59a1ca8 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 17 May 2015 11:51:57 +0200 Subject: [PATCH] new resource collection "allbutfirst" first part of https://bz.apache.org/bugzilla/show_bug.cgi?id=57834 - allbutlast to follow --- .../tools/ant/types/defaults.properties | 1 + .../ant/types/resources/AllButFirst.java | 60 ++++++++++++++++ .../types/resources/first-last-test.xml | 69 ++++++++++++++++++- 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 src/main/org/apache/tools/ant/types/resources/AllButFirst.java diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties index 903f5f014..63c589d21 100644 --- a/src/main/org/apache/tools/ant/types/defaults.properties +++ b/src/main/org/apache/tools/ant/types/defaults.properties @@ -71,6 +71,7 @@ difference=org.apache.tools.ant.types.resources.Difference 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 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/AllButFirst.java b/src/main/org/apache/tools/ant/types/resources/AllButFirst.java new file mode 100644 index 000000000..d9ea50648 --- /dev/null +++ b/src/main/org/apache/tools/ant/types/resources/AllButFirst.java @@ -0,0 +1,60 @@ +/* + * 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.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.apache.tools.ant.types.Resource; + +/** + * ResourceCollection that contains all resources of another + * collection except for the first count elements, a la + * the UNIX tail command with parameter -n +count. + * @since Ant 1.9.5 + */ +public class AllButFirst extends SizeLimitCollection { + + /** + * Take the first count elements. + * @return a Collection of Resources. + */ + protected Collection getCollection() { + int ct = getValidCount(); + Iterator iter = getResourceCollection().iterator(); + List al = new ArrayList(); + for (int i = 0; i < ct && iter.hasNext(); i++) { + // discard + iter.next(); + } + while (iter.hasNext()) { + al.add(iter.next()); + } + return al; + } + + @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 dc3304bbf..46273c1d0 100644 --- a/src/tests/antunit/types/resources/first-last-test.xml +++ b/src/tests/antunit/types/resources/first-last-test.xml @@ -15,7 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + + @@ -154,4 +156,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +