You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/06/27 00:12:45 UTC
svn commit: r1497134 -
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Author: hboutemy
Date: Wed Jun 26 22:12:45 2013
New Revision: 1497134
URL: http://svn.apache.org/r1497134
Log:
merged dist and older columns for better readability
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java?rev=1497134&r1=1497133&r2=1497134&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java Wed Jun 26 22:12:45 2013
@@ -110,16 +110,20 @@ public class DistCheckSourceReleaseMojo
sink.tableCell();
sink.rawText( csr.getConfigurationLine().getArtifactId() );
sink.tableCell_();
+
+ // LATEST column
sink.tableCell();
sink.link( cli.getMetadataFileURL( repoBaseUrl ) );
sink.rawText( csr.getVersion() );
sink.link_();
sink.tableCell_();
+ // DATE column
sink.tableCell();
sink.rawText( csr.getConfigurationLine().getReleaseFromMetadata() );
sink.tableCell_();
+ // central column
sink.tableCell();
sink.link( cli.getBaseURL( repoBaseUrl, "" ) );
sink.text( "artifact" );
@@ -144,13 +148,14 @@ public class DistCheckSourceReleaseMojo
sink.rawText( missing );
}
sink.tableCell_();
- // dist
+
+ // dist column
sink.tableCell();
sink.link( cli.getDist() );
sink.text( cli.getDist().substring( DIST_AREA.length() ) );
sink.link_();
sink.text( "source-release" );
- if ( csr.dist.isEmpty() )
+ if ( csr.dist.isEmpty() && csr.older.isEmpty() )
{
iconSuccess( sink );
}
@@ -182,21 +187,6 @@ public class DistCheckSourceReleaseMojo
new Integer( HtmlMarkup.TAG_TYPE_END )
}, null );
}
- sink.tableCell_();
- //older
- sink.tableCell();
- sink.link( cli.getDist() );
- sink.text( cli.getDist().substring( DIST_AREA.length() ) );
- sink.link_();
- sink.text( "source-release" );
- if ( csr.dist.isEmpty() )
- {
- iconSuccess( sink );
- }
- else
- {
- iconWarning( sink );
- }
StringBuilder cliOlder = new StringBuilder();
for ( String missing : csr.older )
@@ -290,9 +280,6 @@ public class DistCheckSourceReleaseMojo
sink.tableHeaderCell();
sink.rawText( "dist" );
sink.tableHeaderCell_();
- sink.tableHeaderCell();
- sink.rawText( "Older in dist REGEX ISSUE NO TRUST (mainly for doxia) " );
- sink.tableHeaderCell_();
sink.tableRow_();
for ( DistCheckSourceRelease csr : results )