You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/05/18 21:09:17 UTC
svn commit: r657609 - in /maven/plugin-tools/trunk:
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/
maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/
maven-plugin-tools-api/src/main/java/org/apache/maven/to...
Author: bentmann
Date: Sun May 18 12:09:17 2008
New Revision: 657609
URL: http://svn.apache.org/viewvc?rev=657609&view=rev
Log:
o Made goals on plugin-info.html appear in alphabetical order
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
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-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=657609&r1=657608&r2=657609&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java Sun May 18 12:09:17 2008
@@ -21,7 +21,9 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
@@ -310,7 +312,10 @@
tableHeader( new String[] { goalColumnName, descriptionColumnName } );
}
- for ( Iterator i = pluginDescriptor.getMojos().iterator(); i.hasNext(); )
+ List mojos = new ArrayList();
+ mojos.addAll( pluginDescriptor.getMojos() );
+ PluginUtils.sortMojos( mojos );
+ for ( Iterator i = mojos.iterator(); i.hasNext(); )
{
MojoDescriptor mojo = (MojoDescriptor) i.next();
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=657609&r1=657608&r2=657609&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 Sun May 18 12:09:17 2008
@@ -25,8 +25,6 @@
import java.io.StringReader;
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;
@@ -372,17 +370,7 @@
}
}
- Collections.sort( mojoDescriptors, new Comparator()
- {
-
- public int compare( Object arg0, Object arg1 )
- {
- MojoDescriptor mojo0 = (MojoDescriptor) arg0;
- MojoDescriptor mojo1 = (MojoDescriptor) arg1;
- return mojo0.getGoal().compareToIgnoreCase( mojo1.getGoal() );
- }
-
- } );
+ PluginUtils.sortMojos( mojoDescriptors );
writer.write( " /** {@inheritDoc} */" + LS );
writer.write( " public void execute()" + 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=657609&r1=657608&r2=657609&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 Sun May 18 12:09:17 2008
@@ -27,6 +27,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -35,6 +37,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.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
@@ -393,4 +396,27 @@
return sb.toString();
}
+ /**
+ * Sorts the specified mojo descriptors by goal name.
+ *
+ * @param mojoDescriptors The mojo descriptors to sort, may be <code>null</code>.
+ */
+ public static void sortMojos( List mojoDescriptors )
+ {
+ if ( mojoDescriptors != null )
+ {
+ Collections.sort( mojoDescriptors, new Comparator()
+ {
+
+ public int compare( Object arg0, Object arg1 )
+ {
+ MojoDescriptor mojo0 = (MojoDescriptor) arg0;
+ MojoDescriptor mojo1 = (MojoDescriptor) arg1;
+ return mojo0.getGoal().compareToIgnoreCase( mojo1.getGoal() );
+ }
+
+ } );
+ }
+ }
+
}