From 08bed224ec857a865628e6d1ca051356d631d678 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Fri, 1 Jun 2018 22:25:50 +0200 Subject: [PATCH] Tidy up --- src/main/org/apache/tools/ant/taskdefs/Copy.java | 2 +- .../org/apache/tools/ant/types/selectors/OwnedBySelector.java | 1 - .../apache/tools/ant/types/selectors/PosixGroupSelector.java | 1 - .../tools/ant/types/selectors/PosixPermissionsSelector.java | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index 232efb19c..f56f5ab54 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -773,7 +773,7 @@ public class Copy extends Task { final FileNameMapper mapper, final Hashtable map) { String[] toCopy = null; if (forceOverwrite) { - final List v = new ArrayList(); + final List v = new ArrayList<>(); for (String name : names) { if (mapper.mapFileName(name) != null) { v.add(name); diff --git a/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java b/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java index 4399aa236..0044f71e1 100644 --- a/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/OwnedBySelector.java @@ -25,7 +25,6 @@ import java.nio.file.LinkOption; import java.nio.file.attribute.UserPrincipal; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.PropertyHelper; /** * A selector that selects files based on their owner. diff --git a/src/main/org/apache/tools/ant/types/selectors/PosixGroupSelector.java b/src/main/org/apache/tools/ant/types/selectors/PosixGroupSelector.java index 900a327ce..c5ee7c8d6 100644 --- a/src/main/org/apache/tools/ant/types/selectors/PosixGroupSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/PosixGroupSelector.java @@ -19,7 +19,6 @@ package org.apache.tools.ant.types.selectors; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.PropertyHelper; import java.io.File; import java.io.IOException; diff --git a/src/main/org/apache/tools/ant/types/selectors/PosixPermissionsSelector.java b/src/main/org/apache/tools/ant/types/selectors/PosixPermissionsSelector.java index 676646e86..4eac488ab 100644 --- a/src/main/org/apache/tools/ant/types/selectors/PosixPermissionsSelector.java +++ b/src/main/org/apache/tools/ant/types/selectors/PosixPermissionsSelector.java @@ -19,7 +19,6 @@ package org.apache.tools.ant.types.selectors; import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.PropertyHelper; import org.apache.tools.ant.util.PermissionUtils; import java.io.File;