Author: peterreilly
Date: Sun Aug 12 11:15:29 2007
New Revision: 565096
URL: http://svn.apache.org/viewvc?view=rev&rev=565096
Log:
merge checkstyle
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
Sun Aug 12 11:15:29 2007
@@ -421,7 +421,7 @@
/**
* 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;
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Sun Aug 12 11:15:29 2007
@@ -225,7 +225,7 @@
* @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;
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.java
Sun Aug 12 11:15:29 2007
@@ -24,6 +24,7 @@
*
*
*/
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
public class ClassFileUtils {
/**
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.java
Sun Aug 12 11:15:29 2007
@@ -34,7 +34,7 @@
* A set of useful methods relating to extensions.
*
*/
-public class ExtensionUtil {
+public final class ExtensionUtil {
/**
* Class is not meant to be instantiated.
*/
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java
Sun Aug 12 11:15:29 2007
@@ -28,6 +28,7 @@
*
* @since Ant 1.6.3
*/
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
public class JavahAdapterFactory {
/**
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.java
Sun Aug 12 11:15:29 2007
@@ -26,6 +26,7 @@
*
* @since Ant 1.6.3
*/
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
public interface Native2AsciiAdapter {
/**
* Convert the encoding of srcFile writing to destFile.
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.java
Sun Aug 12 11:15:29 2007
@@ -28,6 +28,7 @@
*
* @since Ant 1.6.3
*/
+// CheckStyle:HideUtilityClassConstructorCheck OFF (bc)
public class Native2AsciiAdapterFactory {
/**
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPConfigurator.java
Sun Aug 12 11:15:29 2007
@@ -28,6 +28,7 @@
* 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
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java
Sun Aug 12 11:15:29 2007
@@ -21,6 +21,7 @@
* Interface to hold constants used by the SOS tasks
*
*/
+// CheckStyle:InterfaceIsTypeCheck OFF (bc)
public interface SOSCmd {
// soscmd Command options
/** The sos executable */
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java?view=diff&rev=565096&r1=565095&r2=565096
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.java
Sun Aug 12 11:15:29 2007
@@ -21,6 +21,7 @@
* 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";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
