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 2013/09/07 22:17:57 UTC
svn commit: r1520805 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main:
java/org/apache/maven/report/projectinfo/dependencies/renderer/ resources/
Author: michaelo
Date: Sat Sep 7 20:17:56 2013
New Revision: 1520805
URL: http://svn.apache.org/r1520805
Log:
[MPIR-289] DependenciesRenderer's FileDecimalFormat claims to use SI prefixes but calculated numbers do not match
- Cleaned up JavaDoc references
- Use true base 10 numbers
- Fixed several translations accordingly
- Employed a number format according to the SI (BIPM): Anything else but an optional space is not allowed because it is misleading.
Modified:
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_es.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
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=1520805&r1=1520804&r2=1520805&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 Sat Sep 7 20:17:56 2013
@@ -80,7 +80,7 @@ public class DependenciesRenderer
private static final String IMG_CLOSE_URL = "./images/close.gif";
/** Used to format decimal values in the "Dependency File Details" table */
- protected static final DecimalFormat DEFAULT_DECIMAL_FORMAT = new DecimalFormat( "#,##0" );
+ protected static final DecimalFormat DEFAULT_DECIMAL_FORMAT = new DecimalFormat( "###0" );
private static final Set<String> JAR_SUBTYPE;
@@ -1449,12 +1449,12 @@ public class DependenciesRenderer
}
/**
- * Formats file length with the associated <a href="http://en.wikipedia.org/wiki/SI_prefix#Computing">SI</a> unit
- * (GB, MB, kB) and using the pattern <code>########.00</code> by default.
+ * Formats file length with the associated <a href="https://en.wikipedia.org/wiki/Metric_prefix">SI</a> prefix
+ * (GB, MB, kB) and using the pattern <code>###0.00</code> by default.
*
- * @see <a href="http://en.wikipedia.org/wiki/SI_prefix#Computing"> http://en.wikipedia.org/wiki/SI_prefix#Computing</a>
- * @see <a href="http://en.wikipedia.org/wiki/Binary_prefix"> http://en.wikipedia.org/wiki/Binary_prefix</a>
- * @see <a href="http://en.wikipedia.org/wiki/Octet_(computing)"> http://en.wikipedia.org/wiki/Octet_(computing)</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Metric_prefix">https://en.wikipedia.org/wiki/Metric_prefix</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Binary_prefix">https://en.wikipedia.org/wiki/Binary_prefix</a>
+ * @see <a href="https://en.wikipedia.org/wiki/Octet_%28computing%29">https://en.wikipedia.org/wiki/Octet_(computing)</a>
*/
static class FileDecimalFormat
extends DecimalFormat
@@ -1473,7 +1473,7 @@ public class DependenciesRenderer
*/
public FileDecimalFormat( I18N i18n, Locale locale )
{
- super( "#,###.00" );
+ super( "###0.00" );
this.i18n = i18n;
this.locale = locale;
@@ -1482,21 +1482,21 @@ public class DependenciesRenderer
/** {@inheritDoc} */
public StringBuffer format( long fs, StringBuffer result, FieldPosition fieldPosition )
{
- if ( fs > 1024 * 1024 * 1024 )
+ if ( fs > 1000 * 1000 * 1000 )
{
- result = super.format( (float) fs / ( 1024 * 1024 * 1024 ), result, fieldPosition );
+ result = super.format( (float) fs / ( 1000 * 1000 * 1000 ), result, fieldPosition );
result.append( " " ).append( getString( "report.dependencies.file.details.column.size.gb" ) );
return result;
}
- if ( fs > 1024 * 1024 )
+ if ( fs > 1000 * 1000 )
{
- result = super.format( (float) fs / ( 1024 * 1024 ), result, fieldPosition );
+ result = super.format( (float) fs / ( 1000 * 1000 ), result, fieldPosition );
result.append( " " ).append( getString( "report.dependencies.file.details.column.size.mb" ) );
return result;
}
- result = super.format( (float) fs / ( 1024 ), result, fieldPosition );
+ result = super.format( (float) fs / ( 1000 ), result, fieldPosition );
result.append( " " ).append( getString( "report.dependencies.file.details.column.size.kb" ) );
return result;
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties?rev=1520805&r1=1520804&r2=1520805&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties Sat Sep 7 20:17:56 2013
@@ -58,9 +58,9 @@ report.dependencies.file.details.column.
report.dependencies.file.details.column.packages = Packages
report.dependencies.file.details.column.sealed = Sealed
report.dependencies.file.details.column.size = Tama\u00f1o
-report.dependencies.file.details.column.size.gb = Gb
-report.dependencies.file.details.column.size.mb = Mb
-report.dependencies.file.details.column.size.kb = kb
+report.dependencies.file.details.column.size.gb = GB
+report.dependencies.file.details.column.size.mb = MB
+report.dependencies.file.details.column.size.kb = kB
report.dependencies.file.details.title = Detalles del Fichero
report.dependencies.file.details.total = Total
report.dependencies.graph.tables.licenses = Licencias
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties?rev=1520805&r1=1520804&r2=1520805&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_gl.properties Sat Sep 7 20:17:56 2013
@@ -57,9 +57,9 @@ report.dependencies.file.details.column.
report.dependencies.file.details.column.packages = Paquetes
report.dependencies.file.details.column.sealed = Selado
report.dependencies.file.details.column.size = Tama\u00f1o
-report.dependencies.file.details.column.size.gb = Gb
-report.dependencies.file.details.column.size.mb = Mb
-report.dependencies.file.details.column.size.kb = kb
+report.dependencies.file.details.column.size.gb = GB
+report.dependencies.file.details.column.size.mb = MB
+report.dependencies.file.details.column.size.kb = kB
report.dependencies.file.details.title = Detalles do Ficheiro
report.dependencies.file.details.total = Total
report.dependencies.graph.tables.licenses = Licencias
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties?rev=1520805&r1=1520804&r2=1520805&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties Sat Sep 7 20:17:56 2013
@@ -59,8 +59,8 @@ report.dependencies.file.details.column.
report.dependencies.file.details.column.sealed = Selado
report.dependencies.file.details.column.size = Tamanho
report.dependencies.file.details.column.size.gb = GB
-report.dependencies.file.details.column.size.kb = KB
report.dependencies.file.details.column.size.mb = MB
+report.dependencies.file.details.column.size.kb = kB
report.dependencies.file.details.title = Detalhes do arquivo de depend\u00eancia
report.dependencies.file.details.total = Total
report.dependencies.graph.tables.licenses = Licen\u00e7as