From d589fdf439f0ec8fa3af5375a99003a1813ecaa0 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Fri, 28 Jan 2005 11:33:39 +0000 Subject: [PATCH] checkstyle git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277541 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/depend/ClassFile.java | 5 +++-- .../tools/ant/taskdefs/optional/depend/Depend.java | 8 ++++---- .../optional/depend/constantpool/ConstantPool.java | 11 +++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java index a4d72c1fd..ef7ce7425 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2002,2004 The Apache Software Foundation + * Copyright 2000-2002,2004-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,8 @@ public class ClassFile { ClassCPInfo classEntry = (ClassCPInfo) entry; if (!classEntry.getClassName().equals(className)) { - classRefs.addElement(ClassFileUtils.convertSlashName(classEntry.getClassName())); + classRefs.addElement( + ClassFileUtils.convertSlashName(classEntry.getClassName())); } } } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index fb3245a5c..aeba45f77 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 The Apache Software Foundation + * Copyright 2000-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,9 +162,9 @@ public class Depend extends MatchingTask { } /** - * flag to set to true if you want dependency issues with RMI + * Flag to set to true if you want dependency issues with RMI * stubs to appear at warning level. - * @param warnOnRmiStubs + * @param warnOnRmiStubs if true set dependency issues to appear at warning level. * @since Ant1.7 */ public void setWarnOnRmiStubs(boolean warnOnRmiStubs) { @@ -710,7 +710,7 @@ public class Depend extends MatchingTask { * @param files the names of the files in the source dir which are to be * checked. */ - protected void scanDir(File srcDir, String files[]) { + protected void scanDir(File srcDir, String[] files) { for (int i = 0; i < files.length; i++) { File srcFile = new File(srcDir, files[i]); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java index ab37e4cd4..b33dea194 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2004 The Apache Software Foundation + * Copyright 2000-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -261,9 +261,12 @@ public class ConstantPool { InterfaceMethodRefCPInfo interfaceMethodRefEntry = (InterfaceMethodRefCPInfo) element; - if (interfaceMethodRefEntry.getInterfaceMethodClassName().equals(interfaceMethodClassName) - && interfaceMethodRefEntry.getInterfaceMethodName().equals(interfaceMethodName) - && interfaceMethodRefEntry.getInterfaceMethodType().equals(interfaceMethodType)) { + if (interfaceMethodRefEntry.getInterfaceMethodClassName().equals( + interfaceMethodClassName) + && interfaceMethodRefEntry.getInterfaceMethodName().equals( + interfaceMethodName) + && interfaceMethodRefEntry.getInterfaceMethodType().equals( + interfaceMethodType)) { index = i; } }