From 3d1db2c8f3fb8f030972d94e47ecd924f46219b3 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Thu, 15 Mar 2012 12:23:13 +0400
Subject: [PATCH] IDEA-76142: Gradle support - cannot update IDEA projects once
 one of build.gradle files changes

Showing module dependency changes as well
---
 .../sync/conflict/GradleConflictControlFactory.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
index 8e3cbafcc191..746d19479961 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
@@ -31,10 +31,13 @@ import java.util.Collection;
  */
 public class GradleConflictControlFactory {
   
-  @NotNull private final GradleLibraryDependencyConflictControlFactory myLibraryFactory;
+  @NotNull private final GradleLibraryDependencyConflictControlFactory myLibraryDependencyFactory;
+  @NotNull private final GradleCommonDependencyConflictControlFactory  myCommonDependencyFactory;
 
-  public GradleConflictControlFactory(@NotNull GradleLibraryDependencyConflictControlFactory factory) {
-    myLibraryFactory = factory;
+  public GradleConflictControlFactory(@NotNull GradleLibraryDependencyConflictControlFactory libraryFactory,
+                                      @NotNull GradleCommonDependencyConflictControlFactory commonDependencyFactory) {
+    myLibraryDependencyFactory = libraryFactory;
+    myCommonDependencyFactory = commonDependencyFactory;
   }
 
   /**
@@ -63,12 +66,12 @@ public class GradleConflictControlFactory {
 
       @Override
       public void visit(@NotNull LibraryOrderEntry libraryDependency) {
-        result.set(myLibraryFactory.getControl(libraryDependency, changes));
+        result.set(myLibraryDependencyFactory.getControl(libraryDependency, changes));
       }
 
       @Override
       public void visit(@NotNull ModuleOrderEntry moduleDependency) {
-        
+        result.set(myCommonDependencyFactory.getControl(moduleDependency, changes));
       }
 
       @Override