You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/07/24 13:41:50 UTC
svn commit: r679366 - in
/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap:
DoapMojo.java DoapUtil.java
Author: vsiveton
Date: Thu Jul 24 04:41:48 2008
New Revision: 679366
URL: http://svn.apache.org/viewvc?rev=679366&view=rev
Log:
o fixed toLowerCase() pitfalls
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?rev=679366&r1=679365&r2=679366&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java Thu Jul 24 04:41:48 2008
@@ -28,6 +28,7 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -65,7 +66,8 @@
* Generate a <a href="http://usefulinc.com/ns/doap">Description of a Project (DOAP)</a>
* file from the main information found in a POM.
* <br/>
- * <b>Note</b>: The generated file is tailored for use by projects at {{{http://projects.apache.org/doap.html}Apache}}.
+ * <b>Note</b>: The generated file is tailored for use by projects at
+ * <a href="http://projects.apache.org/doap.html">Apache</a>.
*
* @author Jason van Zyl
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -406,7 +408,8 @@
XmlWriterUtil.writeLineBreak( writer );
XmlWriterUtil.writeCommentText( writer, "A name of something.", 2 );
- if ( asfExtOptions.isIncluded() && !project.getName().toLowerCase().trim().startsWith( "apache" ) )
+ if ( asfExtOptions.isIncluded()
+ && !project.getName().toLowerCase( Locale.ENGLISH ).trim().startsWith( "apache" ) )
{
DoapUtil.writeRdfResourceElement( writer, "name", "Apache " + project.getName() );
}
Modified: maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java?rev=679366&r1=679365&r2=679366&view=diff
==============================================================================
--- maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java (original)
+++ maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapUtil.java Thu Jul 24 04:41:48 2008
@@ -272,39 +272,28 @@
{
String role = (String) it2.next();
- if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.maintainer" ).toLowerCase() ) != -1 )
+ role = role.toLowerCase( Locale.ENGLISH );
+ if ( role.indexOf( getLowerCaseString( i18n, "doap.maintainer" ) ) != -1 )
{
( (List) returnMap.get( "maintainers" ) ).add( obj );
}
- else if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.developer" ).toLowerCase() ) != -1 )
+ else if ( role.indexOf( getLowerCaseString( i18n, "doap.developer" ) ) != -1 )
{
( (List) returnMap.get( "developers" ) ).add( obj );
}
- else if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.documenter" ).toLowerCase() ) != -1 )
+ else if ( role.indexOf( getLowerCaseString( i18n, "doap.documenter" ) ) != -1 )
{
( (List) returnMap.get( "documenters" ) ).add( obj );
}
- else if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.translator" ).toLowerCase() ) != -1 )
+ else if ( role.indexOf( getLowerCaseString( i18n, "doap.translator" ) ) != -1 )
{
( (List) returnMap.get( "translators" ) ).add( obj );
}
- else if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.tester" ).toLowerCase() ) != -1 )
+ else if ( role.indexOf( getLowerCaseString( i18n, "doap.tester" ) ) != -1 )
{
( (List) returnMap.get( "testers" ) ).add( obj );
}
- else if ( role.toLowerCase().indexOf(
- i18n.getString( "doap-person", Locale.ENGLISH,
- "doap.helper" ).toLowerCase() ) != -1 )
+ else if ( role.indexOf( getLowerCaseString( i18n, "doap.helper" ) ) != -1 )
{
( (List) returnMap.get( "helpers" ) ).add( obj );
}
@@ -322,4 +311,14 @@
return returnMap;
}
+
+ /**
+ * @param i18n not null
+ * @param key not null
+ * @return lower case value for the key in the i18n bundle.
+ */
+ private static String getLowerCaseString( I18N i18n, String key )
+ {
+ return i18n.getString( "project-info-report", Locale.ENGLISH, key ).toLowerCase( Locale.ENGLISH );
+ }
}