From 031ceefb6ac417aa08ebb38f0fb6904c09d403d8 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Sun, 12 Aug 2007 18:14:31 +0000 Subject: [PATCH] checkstyle git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@565095 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/optional/EchoProperties.java | 2 +- src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java | 2 +- .../tools/ant/taskdefs/optional/depend/ClassFileUtils.java | 1 + .../tools/ant/taskdefs/optional/extension/ExtensionUtil.java | 2 +- .../ant/taskdefs/optional/extension/JarLibResolveTask.java | 3 ++- .../tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java | 1 + .../taskdefs/optional/native2ascii/Native2AsciiAdapter.java | 1 + .../optional/native2ascii/Native2AsciiAdapterFactory.java | 1 + .../tools/ant/taskdefs/optional/net/FTPConfigurator.java | 1 + .../org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java | 1 + .../apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java | 1 + 11 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java index b2bbaec88..98f4fb8dd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java @@ -421,7 +421,7 @@ public class EchoProperties extends Task { /** * a tuple for the sort list. */ - private static class Tuple implements Comparable { + private static final class Tuple implements Comparable { private String key; private String value; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java index d570e1141..95fa3ec9d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java @@ -225,7 +225,7 @@ public class Rpm extends Task { * @param sf the spec file name to use. */ public void setSpecFile(String sf) { - if ((sf == null) || (sf.trim().length()==0)) { + if ((sf == null) || (sf.trim().length() == 0)) { throw new BuildException("You must specify a spec file", getLocation()); } this.specFile = sf; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java index 919ac6a1d..c6eec6cc5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java @@ -24,6 +24,7 @@ package org.apache.tools.ant.taskdefs.optional.depend; * * */ +// CheckStyle:HideUtilityClassConstructorCheck OFF (bc) public class ClassFileUtils { /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java index 4e92f1990..089c78947 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java @@ -34,7 +34,7 @@ import org.apache.tools.ant.types.FileSet; * A set of useful methods relating to extensions. * */ -public class ExtensionUtil { +public final class ExtensionUtil { /** * Class is not meant to be instantiated. */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java index ddae8c055..e6409cf5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.java @@ -230,7 +230,8 @@ public class JarLibResolveTask extends Task { return; } } - final String message = "File " + file + " skipped as it " + "does not satisfy extension"; + final String message = "File " + file + " skipped as it " + + "does not satisfy extension"; getProject().log(message, Project.MSG_VERBOSE); throw new BuildException(message); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java index a63e39291..ad3aa87b4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java @@ -28,6 +28,7 @@ import org.apache.tools.ant.util.JavaEnvUtils; * * @since Ant 1.6.3 */ +// CheckStyle:HideUtilityClassConstructorCheck OFF (bc) public class JavahAdapterFactory { /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java index 4bcac3b1c..a4c86688d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java @@ -26,6 +26,7 @@ import org.apache.tools.ant.taskdefs.optional.Native2Ascii; * * @since Ant 1.6.3 */ +// CheckStyle:HideUtilityClassConstructorCheck OFF (bc) public interface Native2AsciiAdapter { /** * Convert the encoding of srcFile writing to destFile. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java index 08260673e..abbaec61d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java @@ -28,6 +28,7 @@ import org.apache.tools.ant.util.JavaEnvUtils; * * @since Ant 1.6.3 */ +// CheckStyle:HideUtilityClassConstructorCheck OFF (bc) public class Native2AsciiAdapterFactory { /** diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java index 43826a73b..956ca4216 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java @@ -28,6 +28,7 @@ import org.apache.tools.ant.Project; * upgrade to jakarta-commons-net 1.4.0, where FTPClientConfig was * introduced. */ +// CheckStyle:HideUtilityClassConstructorCheck OFF (bc) class FTPConfigurator { /** * configures the supplied FTPClient with the various diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java index 0c11e2b38..3543c4143 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.sos; * Interface to hold constants used by the SOS tasks * */ +// CheckStyle:InterfaceIsTypeCheck OFF (bc) public interface SOSCmd { // soscmd Command options /** The sos executable */ diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java index 64940c6bb..4144d4492 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java @@ -21,6 +21,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; * Holds all the constants for the VSS tasks. * */ +// CheckStyle:InterfaceIsType OFF (bc) public interface MSVSSConstants { /** Constant for the thing to execute */ String SS_EXE = "ss";