further simplication

kohsuke · kohsuke · commit 0ea5a28d26c4 · 2011-12-16T17:34:23.000-08:00
diff --git a/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java b/maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
@@ -235,14 +235,11 @@ private List<MavenReporter> getMavenReporters(MavenProject mavenProject) {
         }        
         
         private void initMojoStartTime( MavenProject mavenProject) {
-            this.currentMojoStartPerModuleName.put( new ModuleName( mavenProject.getGroupId(),
-                                                                    mavenProject.getArtifactId() ),
-                                                    Long.valueOf( new Date().getTime() ) );
+            this.currentMojoStartPerModuleName.put( new ModuleName(mavenProject), new Date().getTime() );
         }
         
         private Long getMojoStartTime(MavenProject mavenProject) {
-            return currentMojoStartPerModuleName.get( new ModuleName( mavenProject.getGroupId(),
-                                                                      mavenProject.getArtifactId() ) );
+            return currentMojoStartPerModuleName.get( new ModuleName(mavenProject) );
         }
         
         /**
@@ -499,7 +496,7 @@ private void recordMojoSucceeded(ExecutionEvent event) {
             
             MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
             
-            mavenBuildProxy2.setExecutedMojos( this.executedMojosPerModule.get( new ModuleName( event.getProject() ) ) );
+            mavenBuildProxy2.setExecutedMojos( this.executedMojosPerModule.get( new ModuleName(event) ) );
             
             if (mavenReporters != null) {
                 for (MavenReporter mavenReporter : mavenReporters) {
@@ -555,7 +552,7 @@ private void recordMojoFailed(ExecutionEvent event) {
             
             MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
             
-            mavenBuildProxy2.setExecutedMojos( this.executedMojosPerModule.get( new ModuleName( event.getProject() ) ) );
+            mavenBuildProxy2.setExecutedMojos( this.executedMojosPerModule.get( new ModuleName(event) ) );
             
             if (mavenReporters != null) {
                 for (MavenReporter mavenReporter : mavenReporters) {
diff --git a/maven-plugin/src/main/java/hudson/maven/ModuleName.java b/maven-plugin/src/main/java/hudson/maven/ModuleName.java
@@ -23,6 +23,7 @@
  */
 package hudson.maven;
 
+import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.Extension;
@@ -46,6 +47,10 @@ public ModuleName(String groupId, String artifactId) {
         this.artifactId = artifactId;
     }
 
+    public ModuleName(ExecutionEvent event) {
+        this(event.getProject());
+    }
+
     public ModuleName(MavenProject project) {
         this(project.getGroupId(),project.getArtifactId());
     }
