From 0d02e63f28526fe2bc2cbd29566e74a50f994b4d Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 7 Apr 2016 18:11:34 +0300
Subject: [PATCH] IDEA-153582 MavenPlugin.Execution phase

---
 .../jetbrains/idea/maven/model/MavenPlugin.java    | 14 ++++++++++++++
 .../server/embedder/Maven2ModelConverter.java      |  2 +-
 .../idea/maven/server/MavenModelConverter.java     |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java
index abe3fb4b23d7..f127ace77adc 100644
--- a/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java
+++ b/plugins/maven/maven-server-api/src/org/jetbrains/idea/maven/model/MavenPlugin.java
@@ -160,17 +160,27 @@ public class MavenPlugin implements Serializable {
     private final List<String> myGoals;
     private final Element myConfiguration;
     private final String myExecutionId;
+    private final String myPhase;
 
     public Execution(String executionId, List<String> goals, Element configuration) {
+      this(executionId, null, goals, configuration);
+    }
+
+    public Execution(String executionId, String phase, List<String> goals, Element configuration) {
       myGoals = goals;
       myConfiguration = configuration;
       myExecutionId = executionId;
+      myPhase = phase;
     }
 
     public String getExecutionId() {
       return myExecutionId;
     }
 
+    public String getPhase() {
+      return myPhase;
+    }
+
     public List<String> getGoals() {
       return myGoals;
     }
@@ -189,6 +199,7 @@ public class MavenPlugin implements Serializable {
 
       if (myGoals != null ? !myGoals.equals(that.myGoals) : that.myGoals != null) return false;
       if (myExecutionId != null ? !myExecutionId.equals(that.myExecutionId) : that.myExecutionId != null) return false;
+      if (myPhase != null ? !myPhase.equals(that.myPhase) : that.myPhase != null) return false;
       if (!JDOMUtil.areElementsEqual(myConfiguration, that.myConfiguration)) return false;
 
       return true;
@@ -200,6 +211,9 @@ public class MavenPlugin implements Serializable {
       if (myExecutionId != null) {
         result = 31 * result + myExecutionId.hashCode();
       }
+      if (myPhase != null) {
+        result = 31 * result + myPhase.hashCode();
+      }
 
       return result;
     }
diff --git a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ModelConverter.java b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ModelConverter.java
index 9b6d586cddfd..4642d0bc08f1 100644
--- a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ModelConverter.java
+++ b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/Maven2ModelConverter.java
@@ -273,7 +273,7 @@ public class Maven2ModelConverter {
   }
 
   public static MavenPlugin.Execution convertExecution(PluginExecution execution) throws RemoteException {
-    return new MavenPlugin.Execution(execution.getId(), execution.getGoals(), convertConfiguration(execution.getConfiguration()));
+    return new MavenPlugin.Execution(execution.getId(), execution.getPhase(), execution.getGoals(), convertConfiguration(execution.getConfiguration()));
   }
 
   private static Element convertConfiguration(Object config) throws RemoteException {
diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
index daecb94144ac..84554f23877c 100644
--- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
+++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/MavenModelConverter.java
@@ -264,7 +264,7 @@ public class MavenModelConverter {
   }
 
   public static MavenPlugin.Execution convertExecution(PluginExecution execution) throws RemoteException {
-    return new MavenPlugin.Execution(execution.getId(), execution.getGoals(), convertConfiguration(execution.getConfiguration()));
+    return new MavenPlugin.Execution(execution.getId(), execution.getPhase(), execution.getGoals(), convertConfiguration(execution.getConfiguration()));
   }
 
   private static Element convertConfiguration(Object config) throws RemoteException {