Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 14228 invoked from network); 5 Oct 2007 09:33:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Oct 2007 09:33:45 -0000 Received: (qmail 54752 invoked by uid 500); 5 Oct 2007 09:33:33 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 54711 invoked by uid 500); 5 Oct 2007 09:33:33 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 54700 invoked by uid 500); 5 Oct 2007 09:33:33 -0000 Received: (qmail 54697 invoked by uid 99); 5 Oct 2007 09:33:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 02:33:33 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 09:33:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1CA541A9838; Fri, 5 Oct 2007 02:32:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r582163 - in /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant: taskdefs/Rmic.java taskdefs/optional/depend/Depend.java util/ResourceUtils.java Date: Fri, 05 Oct 2007 09:32:53 -0000 To: ant-cvs@apache.org From: peterreilly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071005093254.1CA541A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: peterreilly Date: Fri Oct 5 02:32:51 2007 New Revision: 582163 URL: http://svn.apache.org/viewvc?rev=582163&view=rev Log: sync: checkstyle Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java?rev=582163&r1=582162&r2=582163&view=diff ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Rmic.java Fri Oct 5 02:32:51 2007 @@ -530,7 +530,7 @@ String path = classname.replace('.', File.separatorChar) + ".class"; File f = new File(baseDir, path); if (f.isFile()) { - scanDir(baseDir, new String[] { path }, adapter.getMapper()); + scanDir(baseDir, new String[] {path}, adapter.getMapper()); } else { // Does not exist, so checking whether it is up to date makes no sense. // Compilation will fail later anyway, but tests expect a certain output. Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java?rev=582163&r1=582162&r2=582163&view=diff ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java Fri Oct 5 02:32:51 2007 @@ -773,7 +773,8 @@ * Find the source file for a given class * * @param classname the classname in slash format. - * @param sourceFileKnownToExist if not null, a file already known to exist (saves call to .exists()) + * @param sourceFileKnownToExist if not null, a file already known to exist + * (saves call to .exists()) */ private File findSourceFile(String classname, File sourceFileKnownToExist) { String sourceFilename; @@ -826,7 +827,8 @@ file.getPath().length() - ".class".length()); info.className = ClassFileUtils.convertSlashName(relativeName); - info.sourceFile = sourceFileKnownToExist = findSourceFile(relativeName, sourceFileKnownToExist); + info.sourceFile = sourceFileKnownToExist = findSourceFile( + relativeName, sourceFileKnownToExist); classFileList.addElement(info); } else { addClassFiles(classFileList, file, root); Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java?rev=582163&r1=582162&r2=582163&view=diff ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/util/ResourceUtils.java Fri Oct 5 02:32:51 2007 @@ -43,11 +43,8 @@ import org.apache.tools.ant.types.resources.Restrict; import org.apache.tools.ant.types.resources.Resources; import org.apache.tools.ant.types.resources.Touchable; -import org.apache.tools.ant.types.resources.selectors.Or; -import org.apache.tools.ant.types.resources.selectors.And; import org.apache.tools.ant.types.resources.selectors.Not; import org.apache.tools.ant.types.resources.selectors.Date; -import org.apache.tools.ant.types.resources.selectors.Type; import org.apache.tools.ant.types.resources.selectors.Exists; import org.apache.tools.ant.types.resources.selectors.ResourceSelector; import org.apache.tools.ant.types.selectors.SelectorUtils; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org