You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/01/31 01:32:54 UTC
svn commit: r1727771 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main:
java/org/apache/maven/report/projectinfo/
java/org/apache/maven/report/projectinfo/dependencies/renderer/ resources/
Author: michaelo
Date: Sun Jan 31 00:32:54 2016
New Revision: 1727771
URL: http://svn.apache.org/viewvc?rev=1727771&view=rev
Log:
[MPIR-338] Localize alternative text for used icons
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1727771&r1=1727770&r2=1727771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Sun Jan 31 00:32:54 2016
@@ -74,6 +74,12 @@ import org.apache.maven.shared.dependenc
public class DependencyConvergenceReport
extends AbstractProjectInfoReport
{
+ /** URL for the 'icon_success_sml.gif' image */
+ private static final String IMG_SUCCESS_URL = "images/icon_success_sml.gif";
+
+ /** URL for the 'icon_error_sml.gif' image */
+ private static final String IMG_ERROR_URL = "images/icon_error_sml.gif";
+
private static final int PERCENTAGE = 100;
// ----------------------------------------------------------------------
@@ -276,7 +282,7 @@ public class DependencyConvergenceReport
sink.text( key );
sink.sectionTitle3_();
- generateDependencyDetails( sink, depList );
+ generateDependencyDetails( locale, sink, depList );
sink.section3_();
}
@@ -294,7 +300,7 @@ public class DependencyConvergenceReport
List<ReverseDependencyLink> depList = new ArrayList<ReverseDependencyLink>();
depList.add( dependencyLink );
- generateDependencyDetails( sink, depList );
+ generateDependencyDetails( locale, sink, depList );
sink.section3_();
}
@@ -308,7 +314,7 @@ public class DependencyConvergenceReport
* @param sink
* @param depList
*/
- private void generateDependencyDetails( Sink sink, List<ReverseDependencyLink> depList )
+ private void generateDependencyDetails( Locale locale, Sink sink, List<ReverseDependencyLink> depList )
{
sink.table();
@@ -318,7 +324,7 @@ public class DependencyConvergenceReport
sink.tableCell();
- iconError( sink );
+ iconError( locale, sink );
sink.tableCell_();
@@ -538,7 +544,7 @@ public class DependencyConvergenceReport
sink.tableRow();
sink.tableCell();
- iconError( sink );
+ iconError( locale, sink );
sink.tableCell_();
sink.tableCell();
sink.text( getI18nString( locale, "legend.different" ) );
@@ -629,11 +635,11 @@ public class DependencyConvergenceReport
sink.tableCell();
if ( convergence < PERCENTAGE )
{
- iconError( sink );
+ iconError( locale, sink );
}
else
{
- iconSuccess( sink );
+ iconSuccess( locale, sink );
}
sink.nonBreakingSpace();
sink.bold();
@@ -649,7 +655,7 @@ public class DependencyConvergenceReport
sink.tableCell();
if ( convergence >= PERCENTAGE && snapshotCount <= 0 )
{
- iconSuccess( sink );
+ iconSuccess( locale, sink );
sink.nonBreakingSpace();
sink.bold();
sink.text( getI18nString( locale, "stats.readyrelease.success" ) );
@@ -657,7 +663,7 @@ public class DependencyConvergenceReport
}
else
{
- iconError( sink );
+ iconError( locale, sink );
sink.nonBreakingSpace();
sink.bold();
sink.text( getI18nString( locale, "stats.readyrelease.error" ) );
@@ -707,25 +713,23 @@ public class DependencyConvergenceReport
return this.reactorProjects.size() > 1;
}
- private void iconSuccess( Sink sink )
+ private void iconSuccess( Locale locale, Sink sink )
{
sink.figure();
sink.figureCaption();
- // TODO Translate me!
- sink.text( "success" );
+ sink.text( getI18nString( locale, "icon.success" ) );
sink.figureCaption_();
- sink.figureGraphics( "images/icon_success_sml.gif" );
+ sink.figureGraphics( IMG_SUCCESS_URL );
sink.figure_();
}
- private void iconError( Sink sink )
+ private void iconError( Locale locale, Sink sink )
{
sink.figure();
sink.figureCaption();
- // TODO Translate me!
- sink.text( "error" );
+ sink.text( getI18nString( locale, "icon.error" ) );
sink.figureCaption_();
- sink.figureGraphics( "images/icon_error_sml.gif" );
+ sink.figureGraphics( IMG_ERROR_URL );
sink.figure_();
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1727771&r1=1727770&r2=1727771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Sun Jan 31 00:32:54 2016
@@ -21,6 +21,8 @@ package org.apache.maven.report.projecti
import java.io.File;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.text.DecimalFormat;
@@ -39,7 +41,6 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.commons.lang.SystemUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -86,11 +87,6 @@ public class DependenciesRenderer
private static final Set<String> JAR_SUBTYPE;
- /**
- * An HTML script tag with the Javascript used by the dependencies report.
- */
- private static final String JAVASCRIPT;
-
private final DependencyNode dependencyNode;
private final Dependencies dependencies;
@@ -155,20 +151,6 @@ public class DependenciesRenderer
jarSubtype.add( "par" );
jarSubtype.add( "ejb" );
JAR_SUBTYPE = Collections.unmodifiableSet( jarSubtype );
-
- JAVASCRIPT =
- "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR
- + " function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + " {"
- + SystemUtils.LINE_SEPARATOR + " var div = document.getElementById( divId );"
- + SystemUtils.LINE_SEPARATOR + " var img = document.getElementById( imgId );"
- + SystemUtils.LINE_SEPARATOR + " if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR
- + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = 'none';"
- + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR
- + " }" + SystemUtils.LINE_SEPARATOR + " else" + SystemUtils.LINE_SEPARATOR + " {"
- + SystemUtils.LINE_SEPARATOR + " div.style.display = '';" + SystemUtils.LINE_SEPARATOR
- + " img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + " }"
- + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + "</script>"
- + SystemUtils.LINE_SEPARATOR;
}
/**
@@ -485,7 +467,31 @@ public class DependenciesRenderer
private void renderSectionDependencyTree()
{
- sink.rawText( JAVASCRIPT );
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter( sw );
+
+ pw.println( "" );
+ pw.println( "<script language=\"javascript\" type=\"text/javascript\">" );
+ pw.println( " function toggleDependencyDetails( divId, imgId )" );
+ pw.println( " {" );
+ pw.println( " var div = document.getElementById( divId );" );
+ pw.println( " var img = document.getElementById( imgId );" );
+ pw.println( " if( div.style.display == '' )" );
+ pw.println( " {" );
+ pw.println( " div.style.display = 'none';" );
+ pw.printf( " img.src='%s';%n", IMG_INFO_URL );
+ pw.printf( " img.alt='%s';%n", getI18nString( "graph.icon.information" ) );
+ pw.println( " }" );
+ pw.println( " else" );
+ pw.println( " {" );
+ pw.println( " div.style.display = '';" );
+ pw.printf( " img.src='%s';%n", IMG_CLOSE_URL );
+ pw.printf( " img.alt='%s';%n", getI18nString( "graph.icon.close" ) );
+ pw.println( " }" );
+ pw.println( " }" );
+ pw.println( "</script>" );
+
+ sink.rawText( sw.toString() );
// for Dependencies Graph Tree
startSection( getI18nString( "graph.tree.title" ) );
@@ -934,9 +940,13 @@ public class DependenciesRenderer
sink.listItem();
sink.text( id + ( StringUtils.isNotEmpty( artifact.getScope() ) ? " (" + artifact.getScope() + ") " : " " ) );
- sink.rawText( "<img id=\"" + imgId + "\" src=\"" + IMG_INFO_URL
- + "\" alt=\"Information\" onclick=\"toggleDependencyDetail( '" + dependencyDetailId + "', '" + imgId
- + "' );\" style=\"cursor: pointer;vertical-align:text-bottom;\"></img>" );
+
+ String javascript = String.format( "<img id=\"%s\" src=\"%s\" alt=\"%s\""
+ + " onclick=\"toggleDependencyDetails( '%s', '%s' );\""
+ + " style=\"cursor: pointer; vertical-align: text-bottom;\"></img>",
+ imgId, IMG_INFO_URL, getI18nString( "graph.icon.information" ), dependencyDetailId, imgId );
+
+ sink.rawText( javascript );
printDescriptionsAndURLs( node, dependencyDetailId );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1727771&r1=1727770&r2=1727771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties Sun Jan 31 00:32:54 2016
@@ -69,6 +69,8 @@ report.dependencies.file.details.column.
report.dependencies.file.details.columntitle.debuginformation = Indicates whether these dependencies have been compiled with debug information.
report.dependencies.file.details.title = Dependency File Details
report.dependencies.file.details.total = Total
+report.dependencies.graph.icon.close = [Close]
+report.dependencies.graph.icon.information = [Information]
report.dependencies.graph.tables.licenses = Licenses
report.dependencies.graph.tables.unknown = Unknown
report.dependencies.graph.title = Project Dependency Graph
@@ -102,6 +104,8 @@ report.dependencies.transitive.title
report.dependency-convergence.convergence.caption = Dependencies used in modules
report.dependency-convergence.convergence.single.caption = Dependencies used in this project
report.dependency-convergence.description = This document presents the convergence of dependency versions across the entire project, and its sub modules.
+report.dependency-convergence.icon.error = [Error]
+report.dependency-convergence.icon.success = [Success]
report.dependency-convergence.legend = Legend:
report.dependency-convergence.legend.different = At least one dependency has a differing version of the dependency or has SNAPSHOT dependencies.
report.dependency-convergence.legend.shared = All modules/dependencies share one version of the dependency.
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties?rev=1727771&r1=1727770&r2=1727771&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Sun Jan 31 00:32:54 2016
@@ -69,6 +69,8 @@ report.dependencies.file.details.column.
report.dependencies.file.details.columntitle.debuginformation = Gibt an, ob diese Abhängigkeiten mit Debug-Informationen kompiliert wurden.
report.dependencies.file.details.title = Details zu den Abh\u00e4ngigkeiten
report.dependencies.file.details.total = Gesamt
+report.dependencies.graph.icon.close = [schlie\u00dfen]
+report.dependencies.graph.icon.information = [Information]
report.dependencies.graph.tables.licenses = Lizenzen
report.dependencies.graph.tables.unknown = Unbekannt
report.dependencies.graph.title = Abh\u00e4ngigkeitsgraph
@@ -102,6 +104,8 @@ report.dependencies.transitive.title
report.dependency-convergence.convergence.caption = In Modulen verwendete Abh\u00e4ngigkeiten
report.dependency-convergence.convergence.single.caption = In diesem Projekt verwendete Abh\u00e4ngigkeiten
report.dependency-convergence.description = Dieses Dokument informiert \u00fcber die Konvergenz der Versionen von Abh\u00e4ngigkeiten des gesamten Projektes inklusive seiner Module.
+report.dependency-convergence.icon.error = [Fehler]
+report.dependency-convergence.icon.success = [Erfolg]
report.dependency-convergence.legend = Legende:
report.dependency-convergence.legend.different = Mindestens eine Abh\u00e4ngigkeit verwendet eine andere Version der Abh\u00e4ngigkeit oder hat SNAPSHOT-Abh\u00e4ngigkeiten.
report.dependency-convergence.legend.shared = Alle Module/Abh\u00e4ngigkeiten verwenden dieselbe Version der Abh\u00e4ngigkeit.