Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 39076 invoked from network); 30 Dec 2006 23:55:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Dec 2006 23:55:45 -0000 Received: (qmail 23085 invoked by uid 500); 30 Dec 2006 23:55:52 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 23047 invoked by uid 500); 30 Dec 2006 23:55:52 -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 23036 invoked by uid 500); 30 Dec 2006 23:55:52 -0000 Received: (qmail 23033 invoked by uid 99); 30 Dec 2006 23:55:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Dec 2006 15:55:52 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Sat, 30 Dec 2006 15:55:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 38EA61A981A; Sat, 30 Dec 2006 15:54:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r491348 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java Date: Sat, 30 Dec 2006 23:54:50 -0000 To: ant-cvs@apache.org From: peterreilly@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061230235450.38EA61A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: peterreilly Date: Sat Dec 30 15:54:49 2006 New Revision: 491348 URL: http://svn.apache.org/viewvc?view=rev&rev=491348 Log: checkstyle: reduce size of method Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java?view=diff&rev=491348&r1=491347&r2=491348 ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java Sat Dec 30 15:54:49 2006 @@ -383,15 +383,7 @@ } } if (fileNames.size() == 0 && skipEmpty) { - int includedCount - = ((!FileDirBoth.DIR.equals(currentType)) - ? ds.getIncludedFilesCount() : 0) - + ((!FileDirBoth.FILE.equals(currentType)) - ? ds.getIncludedDirsCount() : 0); - - log("Skipping fileset for directory " + base + ". It is " - + ((includedCount > 0) ? "up to date." : "empty."), - Project.MSG_INFO); + logSkippingFileset(currentType, ds, base); continue; } if (!parallel) { @@ -500,6 +492,25 @@ redirector.setAppendProperties(false); redirector.setProperties(); } + } + + /** + * log a message for skipping a fileset. + * @param currentType the current type. + * @param ds the directory scanner. + * @param base the dir base + */ + private void logSkippingFileset( + String currentType, DirectoryScanner ds, File base) { + int includedCount + = ((!FileDirBoth.DIR.equals(currentType)) + ? ds.getIncludedFilesCount() : 0) + + ((!FileDirBoth.FILE.equals(currentType)) + ? ds.getIncludedDirsCount() : 0); + + log("Skipping fileset for directory " + base + ". It is " + + ((includedCount > 0) ? "up to date." : "empty."), + Project.MSG_INFO); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org