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/08/30 00:08:32 UTC
svn commit: r690403 - in
/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin:
generator/PluginHelpGenerator.java util/PluginUtils.java
Author: vsiveton
Date: Fri Aug 29 15:08:31 2008
New Revision: 690403
URL: http://svn.apache.org/viewvc?rev=690403&view=rev
Log:
o revert part of r690203 and improved it
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java?rev=690403&r1=690402&r2=690403&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java Fri Aug 29 15:08:31 2008
@@ -25,8 +25,6 @@
import java.io.InputStream;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -453,18 +451,6 @@
writer.write( LS );
- Collections.sort( mojoDescriptors, new Comparator()
- {
- /** {@inheritDoc} */
- public int compare( Object o1, Object o2 )
- {
- MojoDescriptor md1 = (MojoDescriptor) o1;
- MojoDescriptor md2 = (MojoDescriptor) o2;
-
- return md1.getId().compareTo( md2.getId() );
- }
- } );
-
for ( Iterator it = mojoDescriptors.iterator(); it.hasNext(); )
{
MojoDescriptor descriptor = (MojoDescriptor) it.next();
@@ -514,17 +500,7 @@
{
List params = descriptor.getParameters();
- Collections.sort( params, new Comparator()
- {
- /** {@inheritDoc} */
- public int compare( Object o1, Object o2 )
- {
- Parameter parameter1 = (Parameter) o1;
- Parameter parameter2 = (Parameter) o2;
-
- return parameter1.getName().compareTo( parameter2.getName() );
- }
- } );
+ PluginUtils.sortMojoParameters( params );
writer.write( " if ( detail )" + LS );
writer.write( " {" + LS );
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java?rev=690403&r1=690402&r2=690403&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/util/PluginUtils.java Fri Aug 29 15:08:31 2008
@@ -46,6 +46,7 @@
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
@@ -413,6 +414,7 @@
* Sorts the specified mojo descriptors by goal name.
*
* @param mojoDescriptors The mojo descriptors to sort, may be <code>null</code>.
+ * @see MojoDescriptor#getGoal()
*/
public static void sortMojos( List mojoDescriptors )
{
@@ -425,9 +427,34 @@
{
MojoDescriptor mojo0 = (MojoDescriptor) arg0;
MojoDescriptor mojo1 = (MojoDescriptor) arg1;
+
return mojo0.getGoal().compareToIgnoreCase( mojo1.getGoal() );
}
+ } );
+ }
+ }
+ /**
+ * Sorts the specified mojo parameters by name.
+ *
+ * @param parameters The mojo parameters to sort, may be <code>null</code>.
+ * @see Parameter#getName()
+ * @since 2.4.4
+ */
+ public static void sortMojoParameters( List parameters )
+ {
+ if ( parameters != null )
+ {
+ Collections.sort( parameters, new Comparator()
+ {
+ /** {@inheritDoc} */
+ public int compare( Object arg0, Object arg1 )
+ {
+ Parameter parameter1 = (Parameter) arg0;
+ Parameter parameter2 = (Parameter) arg1;
+
+ return parameter1.getName().compareToIgnoreCase( parameter2.getName() );
+ }
} );
}
}