Browse Source

checkstyle

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277541 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 21 years ago
parent
commit
d589fdf439
3 changed files with 14 additions and 10 deletions
  1. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java
  2. +4
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  3. +7
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java

+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; ClassCPInfo classEntry = (ClassCPInfo) entry;


if (!classEntry.getClassName().equals(className)) { if (!classEntry.getClassName().equals(className)) {
classRefs.addElement(ClassFileUtils.convertSlashName(classEntry.getClassName()));
classRefs.addElement(
ClassFileUtils.convertSlashName(classEntry.getClassName()));
} }
} }
} }


+ 4
- 4
src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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. * stubs to appear at warning level.
* @param warnOnRmiStubs
* @param warnOnRmiStubs if true set dependency issues to appear at warning level.
* @since Ant1.7 * @since Ant1.7
*/ */
public void setWarnOnRmiStubs(boolean warnOnRmiStubs) { 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 * @param files the names of the files in the source dir which are to be
* checked. * checked.
*/ */
protected void scanDir(File srcDir, String files[]) {
protected void scanDir(File srcDir, String[] files) {


for (int i = 0; i < files.length; i++) { for (int i = 0; i < files.length; i++) {
File srcFile = new File(srcDir, files[i]); File srcFile = new File(srcDir, files[i]);


+ 7
- 4
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java View File

@@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -261,9 +261,12 @@ public class ConstantPool {
InterfaceMethodRefCPInfo interfaceMethodRefEntry InterfaceMethodRefCPInfo interfaceMethodRefEntry
= (InterfaceMethodRefCPInfo) element; = (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; index = i;
} }
} }


Loading…
Cancel
Save