Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 55485102BE for ; Tue, 16 Jul 2013 20:32:04 +0000 (UTC) Received: (qmail 82723 invoked by uid 500); 16 Jul 2013 20:32:04 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 82678 invoked by uid 500); 16 Jul 2013 20:32:04 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 82671 invoked by uid 99); 16 Jul 2013 20:32:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jul 2013 20:32:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jul 2013 20:32:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14DBF2388994; Tue, 16 Jul 2013 20:31:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1503871 - /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java Date: Tue, 16 Jul 2013 20:31:43 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130716203143.14DBF2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hboutemy Date: Tue Jul 16 20:31:42 2013 New Revision: 1503871 URL: http://svn.apache.org/r1503871 Log: code simplification Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1503871&r1=1503870&r2=1503871&view=diff ============================================================================== --- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java (original) +++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java Tue Jul 16 20:31:42 2013 @@ -92,6 +92,7 @@ public class DistCheckSiteMojo protected boolean screenShot; private static final String MAVEN_SITE = "http://maven.apache.org"; + /** * Http status ok code. */ @@ -207,25 +208,26 @@ public class DistCheckSiteMojo private void getOverall( Sink sink ) { - if ( statusCode != HTTP_OK ) { iconError( sink ); } else { - boolean tmp = false; + boolean found = false; for ( Map.Entry e : checkMap.entrySet() ) { - tmp = tmp || e.getValue(); - } - if ( tmp ) - { - iconSuccess( sink ); + if ( e.getValue() ) + { + iconSuccess( sink ); + sink.text( ": " + e.getKey().getName() ); + found = true; + } } - else + if ( !found ) { iconWarning( sink ); + sink.text( ": artifact version not found" ); } } } @@ -381,13 +383,6 @@ public class DistCheckSiteMojo sink.tableCell(); csr.getOverall( sink ); - for ( HTMLChecker c : checker ) - { - if ( ( csr.getCheckMap().get( c ) != null ) && csr.getCheckMap().get( c ) ) - { - sink.text( ": " + c.getName() ); - } - } sink.tableCell_(); sink.tableRow_();