getRepositories() {
try {
REPO_LOCK.readLock().lock();
- return myRepositories.values();
+ return sortRepositories(myRepositories.values());
}
finally {
REPO_LOCK.readLock().unlock();
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
index 2e6309a2ed9b..c31352bbd3a2 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.event.HyperlinkEvent;
-import java.util.Collection;
+import java.util.List;
/**
*
@@ -65,12 +65,9 @@ class GitBranchPopup {
}
/**
- *
- * @param project
* @param currentRepository Current repository, which means the repository of the currently open or selected file.
* In the case of synchronized branch operations current repository matter much less, but sometimes is used,
* for example, it is preselected in the repositories combobox in the compare branches dialog.
- * @return
*/
static GitBranchPopup getInstance(@NotNull Project project, @NotNull GitRepository currentRepository) {
return new GitBranchPopup(project, currentRepository);
@@ -157,7 +154,7 @@ class GitBranchPopup {
}
private void fillWithCommonRepositoryActions(DefaultActionGroup popupGroup, GitRepositoryManager repositoryManager) {
- Collection repositories = repositoryManager.getRepositories();
+ List repositories = repositoryManager.getRepositories();
String currentBranch = myMultiRootBranchConfig.getCurrentBranch();
assert currentBranch != null : "Current branch can't be null if branches have not diverged";
popupGroup.add(new GitBranchPopupActions.CurrentBranchAction(currentBranch, " in all roots"));
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
index 42be940eaf37..8f8bcb176f4f 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
@@ -33,7 +33,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -56,7 +55,7 @@ class GitBranchPopupActions {
DefaultActionGroup popupGroup = new DefaultActionGroup(null, false);
popupGroup.addAction(new CurrentBranchAction(GitBranchUiUtil.getDisplayableBranchText(myRepository), "in root " + GitUIUtil.getShortRepositoryName(myRepository)));
- popupGroup.addAction(new NewBranchAction(myProject, Collections.singleton(myRepository), myRepository));
+ popupGroup.addAction(new NewBranchAction(myProject, Collections.singletonList(myRepository), myRepository));
popupGroup.addAction(new CheckoutRevisionActions(myProject, myRepository));
if (toInsert != null) {
@@ -68,7 +67,7 @@ class GitBranchPopupActions {
Collections.sort(localBranches);
for (GitBranch localBranch : localBranches) {
if (!localBranch.equals(myRepository.getCurrentBranch())) { // don't show current branch in the list
- popupGroup.add(new LocalBranchActions(myProject, Collections.singleton(myRepository), localBranch.getName(), myRepository));
+ popupGroup.add(new LocalBranchActions(myProject, Collections.singletonList(myRepository), localBranch.getName(), myRepository));
}
}
@@ -76,7 +75,7 @@ class GitBranchPopupActions {
List remoteBranches = new ArrayList(myRepository.getBranches().getRemoteBranches());
Collections.sort(remoteBranches);
for (GitBranch remoteBranch : remoteBranches) {
- popupGroup.add(new RemoteBranchActions(myProject, Collections.singleton(myRepository), remoteBranch.getName(), myRepository));
+ popupGroup.add(new RemoteBranchActions(myProject, Collections.singletonList(myRepository), remoteBranch.getName(), myRepository));
}
return popupGroup;
@@ -101,10 +100,10 @@ class GitBranchPopupActions {
static class NewBranchAction extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
@NotNull private final GitRepository mySelectedRepository;
- NewBranchAction(@NotNull Project project, @NotNull Collection repositories, @NotNull GitRepository selectedRepository) {
+ NewBranchAction(@NotNull Project project, @NotNull List repositories, @NotNull GitRepository selectedRepository) {
super("New Branch", "Create and checkout new branch", IconLoader.getIcon("/general/add.png"));
myProject = project;
myRepositories = repositories;
@@ -175,11 +174,11 @@ class GitBranchPopupActions {
static class LocalBranchActions extends ActionGroup {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private String myBranchName;
@NotNull private final GitRepository mySelectedRepository;
- LocalBranchActions(@NotNull Project project, @NotNull Collection repositories, @NotNull String branchName,
+ LocalBranchActions(@NotNull Project project, @NotNull List repositories, @NotNull String branchName,
@NotNull GitRepository selectedRepository) {
super("", true);
myProject = project;
@@ -202,11 +201,11 @@ class GitBranchPopupActions {
private static class CheckoutAction extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private final String myBranchName;
@NotNull private final GitRepository mySelectedRepository;
- CheckoutAction(@NotNull Project project, @NotNull Collection repositories, @NotNull String branchName,
+ CheckoutAction(@NotNull Project project, @NotNull List repositories, @NotNull String branchName,
@NotNull GitRepository selectedRepository) {
super("Checkout");
myProject = project;
@@ -224,11 +223,11 @@ class GitBranchPopupActions {
private static class CheckoutAsNewBranch extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private final String myBranchName;
@NotNull private final GitRepository mySelectedRepository;
- CheckoutAsNewBranch(@NotNull Project project, @NotNull Collection repositories, @NotNull String branchName,
+ CheckoutAsNewBranch(@NotNull Project project, @NotNull List repositories, @NotNull String branchName,
@NotNull GitRepository selectedRepository) {
super("Checkout as new branch");
myProject = project;
@@ -254,11 +253,11 @@ class GitBranchPopupActions {
*/
private static class DeleteAction extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private final String myBranchName;
private final GitRepository mySelectedRepository;
- DeleteAction(Project project, Collection repositories, String branchName, GitRepository selectedRepository) {
+ DeleteAction(Project project, List repositories, String branchName, GitRepository selectedRepository) {
super("Delete");
myProject = project;
myRepositories = repositories;
@@ -279,11 +278,11 @@ class GitBranchPopupActions {
static class RemoteBranchActions extends ActionGroup {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private String myBranchName;
@NotNull private final GitRepository mySelectedRepository;
- RemoteBranchActions(@NotNull Project project, @NotNull Collection repositories, @NotNull String branchName,
+ RemoteBranchActions(@NotNull Project project, @NotNull List repositories, @NotNull String branchName,
@NotNull GitRepository selectedRepository) {
super("", true);
myProject = project;
@@ -304,11 +303,11 @@ class GitBranchPopupActions {
private static class CheckoutRemoteBranchAction extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private final String myRemoteBranchName;
@NotNull private final GitRepository mySelectedRepository;
- public CheckoutRemoteBranchAction(@NotNull Project project, @NotNull Collection repositories,
+ public CheckoutRemoteBranchAction(@NotNull Project project, @NotNull List repositories,
@NotNull String remoteBranchName, @NotNull GitRepository selectedRepository) {
super("Checkout as new local branch");
myProject = project;
@@ -339,12 +338,12 @@ class GitBranchPopupActions {
private static class CompareAction extends DumbAwareAction {
private final Project myProject;
- private final Collection myRepositories;
+ private final List myRepositories;
private final String myBranchName;
private final GitRepository mySelectedRepository;
public CompareAction(@NotNull Project project,
- @NotNull Collection repositories,
+ @NotNull List repositories,
@NotNull String branchName,
GitRepository selectedRepository) {
super("Compare");
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
index 4e45aed7a5b4..c45b886bd1f2 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
@@ -24,15 +24,16 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
/**
* @author Kirill Likhodedov
*/
public class GitMultiRootBranchConfig {
- private final Collection myRepositories;
+ private final List myRepositories;
- public GitMultiRootBranchConfig(@NotNull Collection repositories) {
+ public GitMultiRootBranchConfig(@NotNull List repositories) {
myRepositories = repositories;
}
diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
index d10e26f0f000..2209fdc834d9 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
+++ b/plugins/git4idea/tests/git4idea/branch/GitBranchOperationsTest.java
@@ -36,7 +36,7 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
-import java.util.Collection;
+import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import static git4idea.test.GitExec.*;
@@ -51,7 +51,7 @@ public class GitBranchOperationsTest extends AbstractVcsTestCase {
private static final String NEW_BRANCH = "new_branch";
private static final String MASTER = "master";
- private Collection myRepositories;
+ private List myRepositories;
private GitRepository myUltimate;
private GitRepository myCommunity;
private GitRepository myContrib;
diff --git a/plugins/gradle/resources/icons/gradle.png b/plugins/gradle/resources/icons/gradle.png
index b76b4ba5b8a8..af8da119630b 100644
Binary files a/plugins/gradle/resources/icons/gradle.png and b/plugins/gradle/resources/icons/gradle.png differ
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 1487b063dbc5..36d93560b32e 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -36,7 +36,12 @@
-
+
+
+
+
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/bootstrap/GradleBootstrap.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/bootstrap/GradleBootstrap.java
index 762c18a47488..254145d26a65 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/bootstrap/GradleBootstrap.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/bootstrap/GradleBootstrap.java
@@ -15,7 +15,7 @@ import org.jetbrains.plugins.gradle.ui.GradleIcons;
import org.jetbrains.plugins.gradle.util.GradleBundle;
/**
- * // TODO den add doc
+ * Encapsulates initialisation routine of the gradle integration.
*
* @author Denis Zhdanov
* @since 11/3/11 4:01 PM
@@ -42,10 +42,6 @@ public class GradleBootstrap extends AbstractProjectComponent {
}
private void initToolWindow() {
- // TODO den don't show tool window if no gradle project is associated with the current project.
- if (!Boolean.getBoolean("gradle.show.tool.window")) {
- return;
- }
final ToolWindowManagerEx manager = ToolWindowManagerEx.getInstanceEx(myProject);
ToolWindow toolWindow = manager.registerToolWindow(GRADLE_TOOL_WINDOW_ID, false, ToolWindowAnchor.RIGHT);
toolWindow.setIcon(GradleIcons.GRADLE_ICON);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
index bbafe4cd653a..a6b51a7b8204 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
@@ -25,11 +25,10 @@ public class GradleDiffUtil {
* Example: particular module has been added at the gradle side. We want to mark that module, its content root(s), dependencies etc
* as gradle-local changes.
*
- * @param entity target gradle-local entity
- * @return collection of gradle-local changes for the given entity and its interested sub-entities
+ * @param entity target gradle-local entity
+ * @param currentChanges holder for the changes built during the current call
*/
- public static Set buildLocalChanges(@NotNull GradleEntity entity) {
- final Set result = new HashSet();
+ public static void buildLocalChanges(@NotNull GradleEntity entity, @NotNull final Set currentChanges) {
entity.invite(new GradleEntityVisitor() {
@Override
public void visit(@NotNull GradleProject project) {
@@ -38,7 +37,7 @@ public class GradleDiffUtil {
@Override
public void visit(@NotNull GradleModule module) {
- result.add(new GradleModulePresenceChange(module, null));
+ currentChanges.add(new GradleModulePresenceChange(module, null));
for (GradleDependency dependency : module.getDependencies()) {
dependency.invite(this);
}
@@ -61,79 +60,52 @@ public class GradleDiffUtil {
@Override
public void visit(@NotNull GradleLibraryDependency dependency) {
- result.add(new GradleLibraryDependencyPresenceChange(dependency, null));
+ currentChanges.add(new GradleLibraryDependencyPresenceChange(dependency, null));
}
});
- return result;
}
/**
* Analogues to {@link #buildLocalChanges} but targets intellij entity.
*
- * @param module target intellij-local module that doesn't present at the gradle side
- * @return collection of intellij-local changes for the given entity and its interested sub-entities
+ * @param module target intellij-local module that doesn't present at the gradle side
+ * @param currentChanges holder for the changes built during the current call
*/
- public static Set buildLocalChanges(@NotNull Module module) {
- Set result = new HashSet();
- result.add(new GradleModulePresenceChange(null, module));
+ public static void buildLocalChanges(@NotNull Module module, @NotNull Set currentChanges) {
+ currentChanges.add(new GradleModulePresenceChange(null, module));
// TODO den process module sub-entities here (content roots and dependencies).
- return result;
}
/**
* Analogues to {@link #buildLocalChanges} but targets intellij entity.
*
* @param libraryDependency target intellij-local library dependency that doesn't present at the gradle side
- * @return collection of intellij-local changes for the given entity and its interested sub-entities
+ * @param currentChanges holder for the changes built during the current call
*/
- public static Set buildLocalChanges(@NotNull LibraryOrderEntry libraryDependency) {
- return Collections.singleton(new GradleLibraryDependencyPresenceChange(null, libraryDependency));
+ public static void buildLocalChanges(@NotNull LibraryOrderEntry libraryDependency,
+ @NotNull Set currentChanges)
+ {
+ currentChanges.add(new GradleLibraryDependencyPresenceChange(null, libraryDependency));
}
/**
* Performs argument type-based dispatch and delegates to one of strongly typed 'buildLocalChanges()' methods.
*
- * @param entity target intellij-local entity that doesn't present at the gradle side
- * @return collection of intellij-local changes for the given entity and its interested sub-entities
+ * @param entity target intellij-local entity that doesn't present at the gradle side
+ * @param currentChanges holder for the changes built during the current call
*/
- @NotNull
- public static Set buildLocalChanges(@NotNull Object entity) {
+ public static void buildLocalChanges(@NotNull Object entity,
+ @NotNull Set currentChanges)
+ {
if (entity instanceof GradleEntity) {
- return buildLocalChanges((GradleEntity)entity);
+ buildLocalChanges((GradleEntity)entity, currentChanges);
}
else if (entity instanceof Module) {
- return buildLocalChanges((Module)entity);
+ buildLocalChanges((Module)entity, currentChanges);
}
else if (entity instanceof LibraryOrderEntry) {
- return buildLocalChanges((LibraryOrderEntry)entity);
+ buildLocalChanges((LibraryOrderEntry)entity, currentChanges);
}
- else {
- return Collections.emptySet();
- }
- }
-
- /**
- * Concatenates given entities into the single collection and returns it.
- *
- * The main idea behind this method is that most of the time we don't expect changes at all, hence, corresponding changes calculators
- * can use {@link Collections#emptySet()}. However, if some sub-nodes do have changes, attempt
- * to {@link Collection#addAll(Collection) merge} them within the empty set mentioned above would cause an exception.
- *
- * That's why we provide dedicated method for creating new collection as a merge result.
- *
- * @param collections collections to merge
- * @return merge result
- */
- @NotNull
- public static Set concatenate(Collection... collections) {
- Set result = null;
- for (Collection collection : collections) {
- if (result == null) {
- result = new HashSet();
- }
- result.addAll(collection);
- }
- return result == null ? Collections.emptySet() : result;
}
/**
@@ -146,39 +118,34 @@ public class GradleDiffUtil {
* @param gradleEntities entities available at the gradle side
* @param intellijEntities entities available at the intellij side
* @param knownChanges collection that contains known changes about the entities
+ * @param currentChanges holder for the changes discovered during the current call
* @param target intellij entity type
* @param target gradle entity type
- * @return set of changes between the given entity collections
*/
- @NotNull
- public static Set calculate(
+ public static void calculate(
@NotNull GradleStructureChangesCalculator calculator,
@NotNull Iterable gradleEntities,
@NotNull Iterable intellijEntities,
- @NotNull Set knownChanges)
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges)
{
- Set result = Collections.emptySet();
Map intellijEntitiesByKeys = new HashMap();
for (I entity : intellijEntities) {
- final I previous = intellijEntitiesByKeys.put(calculator.getIntellijKey(entity, knownChanges), entity);
+ final I previous = intellijEntitiesByKeys.put(calculator.getIntellijKey(entity), entity);
assert previous == null;
}
for (G gradleEntity: gradleEntities) {
I intellijEntity = intellijEntitiesByKeys.remove(calculator.getGradleKey(gradleEntity, knownChanges));
- Set changesToMerge;
if (intellijEntity == null) {
- changesToMerge = buildLocalChanges(gradleEntity);
+ buildLocalChanges(gradleEntity, currentChanges);
}
else {
- changesToMerge = calculator.calculate(gradleEntity, intellijEntity, knownChanges);
+ calculator.calculate(gradleEntity, intellijEntity, knownChanges, currentChanges);
}
- result = concatenate(result, changesToMerge);
}
for (I entity : intellijEntitiesByKeys.values()) {
- result = concatenate(result, buildLocalChanges(entity));
+ buildLocalChanges(entity, currentChanges);
}
-
- return result;
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
index 4c2490a48af3..077f58b88e90 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleLibraryDependencyStructureChangesCalculator.java
@@ -4,7 +4,6 @@ import com.intellij.openapi.roots.LibraryOrderEntry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.model.GradleLibraryDependency;
-import java.util.Collections;
import java.util.Set;
/**
@@ -14,20 +13,19 @@ import java.util.Set;
public class GradleLibraryDependencyStructureChangesCalculator
implements GradleStructureChangesCalculator
{
- @NotNull
+
@Override
- public Set calculate(@NotNull GradleLibraryDependency gradleEntity,
- @NotNull LibraryOrderEntry intellijEntity,
- @NotNull Set knownChanges)
+ public void calculate(@NotNull GradleLibraryDependency gradleEntity,
+ @NotNull LibraryOrderEntry intellijEntity,
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges)
{
// TODO den implement
- return Collections.emptySet();
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull LibraryOrderEntry entity, @NotNull Set knownChanges) {
- // TODO den consider the known changes
+ public Object getIntellijKey(@NotNull LibraryOrderEntry entity) {
final String result = entity.getLibraryName();
return result == null ? "" : result;
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
index 84c62ec4ff42..28f5ec482cba 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleModuleStructureChangesCalculator.java
@@ -34,24 +34,30 @@ import java.util.Set;
*/
public class GradleModuleStructureChangesCalculator implements GradleStructureChangesCalculator {
- private final GradleLibraryDependencyStructureChangesCalculator myLibraryDependencyCalculator
- = new GradleLibraryDependencyStructureChangesCalculator();
-
- @NotNull
+ private final GradleLibraryDependencyStructureChangesCalculator myLibraryDependencyCalculator;
+ private final GradleProjectStructureHelper myStructureHelper;
+
+ public GradleModuleStructureChangesCalculator(@NotNull GradleLibraryDependencyStructureChangesCalculator libraryDependencyCalculator,
+ @NotNull GradleProjectStructureHelper structureHelper)
+ {
+ myLibraryDependencyCalculator = libraryDependencyCalculator;
+ myStructureHelper = structureHelper;
+ }
+
@Override
- public Set calculate(@NotNull GradleModule gradleEntity,
- @NotNull Module intellijEntity,
- @NotNull Set knownChanges)
+ public void calculate(@NotNull GradleModule gradleEntity,
+ @NotNull Module intellijEntity,
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges)
{
//TODO den process module-local settings
- //TODO den process content roots
- return checkDependencies(gradleEntity, intellijEntity, knownChanges);
+ //TODO den process content roots
+ checkDependencies(gradleEntity, intellijEntity, knownChanges, currentChanges);
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull Module entity, @NotNull Set knownChanges) {
- // TODO den consider the known changes
+ public Object getIntellijKey(@NotNull Module entity) {
return entity.getName();
}
@@ -62,9 +68,10 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
return entity.getName();
}
- private Set checkDependencies(@NotNull GradleModule gradleModule,
- @NotNull Module intellijModule,
- @NotNull Set knownChanges)
+ private void checkDependencies(@NotNull GradleModule gradleModule,
+ @NotNull Module intellijModule,
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges)
{
// Prepare intellij part.
final List intellijModuleDependencies = new ArrayList();
@@ -82,11 +89,10 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
return libraryOrderEntry;
}
};
- final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(intellijModule);
- for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) {
+ for (OrderEntry orderEntry : myStructureHelper.getOrderEntries(intellijModule)) {
orderEntry.accept(policy, null);
}
-
+
// Prepare gradle part.
final List gradleModuleDependencies = new ArrayList();
final List gradleLibraryDependencies = new ArrayList();
@@ -104,12 +110,10 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
for (GradleDependency dependency : gradleModule.getDependencies()) {
dependency.invite(visitor);
}
-
+
// Calculate changes.
// TODO den process module dependencies here as well.
- final Set libraryChanges
- = GradleDiffUtil.calculate(myLibraryDependencyCalculator, gradleLibraryDependencies, intellijLibraryDependencies, knownChanges);
- return libraryChanges;
-
+ GradleDiffUtil.calculate(myLibraryDependencyCalculator, gradleLibraryDependencies, intellijLibraryDependencies,
+ knownChanges, currentChanges);
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
index 9c099280cecf..ad9bc2827854 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChangesCalculator.java
@@ -1,21 +1,15 @@
package org.jetbrains.plugins.gradle.diff;
import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.model.GradleModule;
import org.jetbrains.plugins.gradle.model.GradleProject;
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
import java.util.Set;
-import static java.util.Arrays.asList;
-import static org.jetbrains.plugins.gradle.diff.GradleDiffUtil.concatenate;
-
/**
* Encapsulates functionality of calculating changes between Gradle and IntelliJ IDEA project hierarchies.
*
@@ -26,25 +20,31 @@ import static org.jetbrains.plugins.gradle.diff.GradleDiffUtil.concatenate;
*/
public class GradleProjectStructureChangesCalculator implements GradleStructureChangesCalculator {
- private final GradleModuleStructureChangesCalculator myModuleChangesCalculator = new GradleModuleStructureChangesCalculator();
+ private final GradleModuleStructureChangesCalculator myModuleChangesCalculator;
+ private final GradleProjectStructureHelper myStructureHelper;
+
+ public GradleProjectStructureChangesCalculator(@NotNull GradleModuleStructureChangesCalculator moduleCalculator,
+ @NotNull GradleProjectStructureHelper structureHelper) {
+ myModuleChangesCalculator = moduleCalculator;
+ myStructureHelper = structureHelper;
+ }
- @NotNull
@Override
- public Set calculate(@NotNull GradleProject gradleEntity,
- @NotNull Project intellijEntity,
- @NotNull Set knownChanges)
+ public void calculate(@NotNull GradleProject gradleEntity,
+ @NotNull Project intellijEntity,
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges)
{
- final Set result = calculateProjectChanges(gradleEntity, intellijEntity, knownChanges);
+ calculateProjectChanges(gradleEntity, intellijEntity, currentChanges);
final Set gradleSubEntities = gradleEntity.getModules();
- final List intellijSubEntities = asList(ModuleManager.getInstance(intellijEntity).getModules());
- return concatenate(result, GradleDiffUtil.calculate(myModuleChangesCalculator, gradleSubEntities, intellijSubEntities, knownChanges));
+ final Collection intellijSubEntities = myStructureHelper.getModules(intellijEntity);
+ GradleDiffUtil.calculate(myModuleChangesCalculator, gradleSubEntities, intellijSubEntities, knownChanges, currentChanges);
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull Project entity, @NotNull Set knownChanges) {
- // TODO den consider the known changes
+ public Object getIntellijKey(@NotNull Project entity) {
return entity.getName();
}
@@ -55,43 +55,33 @@ public class GradleProjectStructureChangesCalculator implements GradleStructureC
return entity.getName();
}
- @NotNull
- private static Set calculateProjectChanges(@NotNull GradleProject gradleProject,
- @NotNull Project intellijProject,
- @NotNull Set knownChanges)
+ private void calculateProjectChanges(@NotNull GradleProject gradleProject,
+ @NotNull Project intellijProject,
+ @NotNull Set currentChanges)
{
- final Set nameChanges = checkName(gradleProject, intellijProject, knownChanges);
- final Set levelChanges = checkLanguageLevel(gradleProject, intellijProject, knownChanges);
- return concatenate(nameChanges, levelChanges);
+ checkName(gradleProject, intellijProject, currentChanges);
+ checkLanguageLevel(gradleProject, intellijProject, currentChanges);
}
- @NotNull
- private static Set checkName(@NotNull GradleProject gradleProject,
- @NotNull Project intellijProject,
- @NotNull Set knownChanges)
+ private static void checkName(@NotNull GradleProject gradleProject,
+ @NotNull Project intellijProject,
+ @NotNull Set currentChanges)
{
String gradleName = gradleProject.getName();
String intellijName = intellijProject.getName();
- if (gradleName.equals(intellijName)) {
- return Collections.emptySet();
+ if (!gradleName.equals(intellijName)) {
+ currentChanges.add(new GradleRenameChange(GradleRenameChange.Entity.PROJECT, gradleName, intellijName));
}
- final GradleRenameChange change = new GradleRenameChange(GradleRenameChange.Entity.PROJECT, gradleName, intellijName);
- return knownChanges.contains(change) ? Collections.emptySet()
- : Collections.singleton(change);
}
- @NotNull
- private static Set checkLanguageLevel(@NotNull GradleProject gradleProject,
- @NotNull Project intellijProject,
- @NotNull Set knownChanges)
+ private void checkLanguageLevel(@NotNull GradleProject gradleProject,
+ @NotNull Project intellijProject,
+ @NotNull Set currentChanges)
{
LanguageLevel gradleLevel = gradleProject.getLanguageLevel();
- LanguageLevel intellijLevel = LanguageLevelProjectExtension.getInstance(intellijProject).getLanguageLevel();
- if (gradleLevel == intellijLevel) {
- return Collections.emptySet();
+ LanguageLevel intellijLevel = myStructureHelper.getLanguageLevel(intellijProject);
+ if (gradleLevel != intellijLevel) {
+ currentChanges.add(new GradleLanguageLevelChange(gradleLevel, intellijLevel));
}
- final GradleLanguageLevelChange change = new GradleLanguageLevelChange(gradleLevel, intellijLevel);
- return knownChanges.contains(change) ? Collections.emptySet()
- : Collections.singleton(change);
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelper.java
new file mode 100644
index 000000000000..f0c81df79111
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelper.java
@@ -0,0 +1,37 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.pom.java.LanguageLevel;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+/**
+ * IntelliJ code provides a lot of statical bindings to the interested pieces of data. For example we need to execute code
+ * like below to get list of modules for the target project:
+ *
+ * ModuleManager.getInstance(project).getModules()
+ *
+ * That means that it's not possible to test target classes in isolation if corresponding infrastructure is not set up.
+ * However, we don't want to set it up if we execute a simple standalone test.
+ *
+ * This interface is intended to encapsulate access to the underlying project infrastructure.
+ *
+ * Implementations of this interface are expected to be thread-safe.
+ *
+ * @author Denis Zhdanov
+ * @since 1/26/12 11:32 AM
+ */
+public interface GradleProjectStructureHelper {
+
+ @NotNull
+ LanguageLevel getLanguageLevel(@NotNull Project project);
+
+ @NotNull
+ Collection getModules(@NotNull Project project);
+
+ @NotNull
+ Collection getOrderEntries(@NotNull Module module);
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelperImpl.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelperImpl.java
new file mode 100644
index 000000000000..6b30b59c57f6
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureHelperImpl.java
@@ -0,0 +1,38 @@
+package org.jetbrains.plugins.gradle.diff;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.pom.java.LanguageLevel;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/26/12 11:54 AM
+ */
+public class GradleProjectStructureHelperImpl implements GradleProjectStructureHelper {
+
+ @NotNull
+ @Override
+ public LanguageLevel getLanguageLevel(@NotNull Project project) {
+ return LanguageLevelProjectExtension.getInstance(project).getLanguageLevel();
+ }
+
+ @NotNull
+ @Override
+ public Collection getModules(@NotNull Project project) {
+ return Arrays.asList(ModuleManager.getInstance(project).getModules());
+ }
+
+ @NotNull
+ @Override
+ public Collection getOrderEntries(@NotNull Module module) {
+ return Arrays.asList(ModuleRootManager.getInstance(module).getOrderEntries());
+ }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
index 778d4cc1fdbd..362e0cf18fb7 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
@@ -18,17 +18,60 @@ import java.util.Set;
*/
public interface GradleStructureChangesCalculator {
- // TODO den add doc
- @NotNull
- Set calculate(@NotNull G gradleEntity,
- @NotNull I intellijEntity,
- @NotNull Set knownChanges);
+ /**
+ * Calculates changes between the given entities.
+ *
+ * @param gradleEntity target gradle entity
+ * @param intellijEntity target intellij entity
+ * @param knownChanges changes between the gradle and intellij project structure that has been known up until now
+ * @param currentChanges holder for the changes between the given entities discovered by the current call. Note that
+ * it must contain the change objects that have been known (contained at the 'knownChanges')
+ * but are still in place
+ */
+ void calculate(@NotNull G gradleEntity,
+ @NotNull I intellijEntity,
+ @NotNull Set knownChanges,
+ @NotNull Set currentChanges);
- // TODO den add doc
+ /**
+ * There are three possible situations when we compare a set of gradle entities with a set of intellij entities:
+ *
+ *
+ * - particular entity presents only at the gradle side;
+ * - particular entity presents only at the intellij side;
+ * - particular gradle entity is matched to particular intellij entity (they may have difference in their settings though);
+ *
+ *
+ *
+ * The general idea is to map evey item at the given sets of gradle and intellij entities to particular key (both gradle and
+ * intellij keys are expected to belong to the same class) and then compare them. Matched keys shows that corresponding
+ * entities should be {@link #calculate(GradleEntity, Object, Set) compared to each other}; non-matched indicate that corresponding
+ * entities are gradle- or intellij-local.
+ *
+ * This method allows to match intellij entity to the target key.
+ *
+ * @param entity intellij entity to match
+ * @return key for the given entity
+ * @see #getGradleKey(GradleEntity, Set)
+ */
@NotNull
- Object getIntellijKey(@NotNull I entity, @NotNull Set knownChanges);
-
- // TODO den add doc
+ Object getIntellijKey(@NotNull I entity);
+
+ /**
+ * Serves the same purpose as {@link #getIntellijKey(Object)} but targets gradle entities.
+ *
+ * There is a possible case that two corresponding gradle and intellij entities differ from each other by the setting that
+ * affects the resulting key (e.g. we may use module name as a key for 'module' entities and intellij module name differs from
+ * the name of the corresponding gradle module). We need to match only in one direction then (e.g. consider a situation when
+ * particular module is named differently at gradle and intellij. We shouldn't consider that change during both
+ * {@code intellij-entity -> key} and {@code gradle-entity -> key} mappings because that would produce two different keys).
+ * So, we take into consideration the known changes only during {@code gradle-entity -> key} processing.
+ *
+ * @param entity target gradle entity that should be mapped to a key
+ * @param knownChanges known changes between the gradle and intellij structures
+ * @return key for the given entity
+ * @see #getIntellijKey(Object)
+ */
@NotNull
Object getGradleKey(@NotNull G entity, @NotNull Set knownChanges);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangeListener.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangeListener.java
index fe167530b145..1a6065339169 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangeListener.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangeListener.java
@@ -18,7 +18,9 @@ public interface GradleProjectStructureChangeListener {
/**
* Notifies current listener on the newly discovered changes between the gradle and intellij project models.
*
- * @param changes newly discovered changes between the gradle and intellij project models.
+ * @param oldChanges changes between the gradle and intellij project models that had been known prior to the current update
+ * @param currentChanges the most up-to-date changes between the gradle and intellij project models
*/
- void onChanges(@NotNull Collection changes);
+ void onChanges(@NotNull Collection oldChanges,
+ @NotNull Collection currentChanges);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
index 7825821034ee..f1ee0022e65d 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
@@ -2,15 +2,15 @@ package org.jetbrains.plugins.gradle.sync;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.project.Project;
-import com.intellij.util.containers.ConcurrentHashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
-import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChangesCalculator;
+import org.jetbrains.plugins.gradle.diff.GradleStructureChangesCalculator;
import org.jetbrains.plugins.gradle.model.GradleProject;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicReference;
/**
* // TODO den add doc
@@ -23,11 +23,14 @@ import java.util.concurrent.CopyOnWriteArraySet;
public class GradleProjectStructureChangesModel extends AbstractProjectComponent {
private final Set myListeners = new CopyOnWriteArraySet();
- private final Set myChanges = new ConcurrentHashSet();
+ private final AtomicReference> myChanges
+ = new AtomicReference>(new HashSet());
- private final GradleProjectStructureChangesCalculator myChangesCalculator;
+ private final GradleStructureChangesCalculator myChangesCalculator;
- public GradleProjectStructureChangesModel(@NotNull Project project, @NotNull GradleProjectStructureChangesCalculator changesCalculator) {
+ public GradleProjectStructureChangesModel(@NotNull Project project,
+ @NotNull GradleStructureChangesCalculator changesCalculator)
+ {
super(project);
myChangesCalculator = changesCalculator;
}
@@ -44,15 +47,22 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
*
* {@link #addListener(GradleProjectStructureChangeListener) Registered listeners} are notified if any new change is detected;
*
+ *
+ * Note: it's very important that the listeners are notified after the actual state change, i.e. {@link #getChanges()}
+ * during the update returns up-to-date data.
*
* @param gradleProject gradle project to sync with
*/
public void update(@NotNull GradleProject gradleProject) {
- Set knownChanges = new HashSet(myChanges);
- final Set newChanges = myChangesCalculator.calculate(gradleProject, myProject, knownChanges);
- myChanges.addAll(newChanges);
+ Set knownChanges = new HashSet(myChanges.get());
+ Set currentChanges = new HashSet();
+ myChangesCalculator.calculate(gradleProject, myProject, knownChanges, currentChanges);
+ if (currentChanges.equals(knownChanges)) {
+ return;
+ }
+ myChanges.set(currentChanges);
for (GradleProjectStructureChangeListener listener : myListeners) {
- listener.onChanges(newChanges);
+ listener.onChanges(knownChanges, currentChanges);
}
}
@@ -72,6 +82,6 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
*/
@NotNull
public Set getChanges() {
- return myChanges;
+ return myChanges.get();
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
index 27fc80804c02..b2d0a5ce81eb 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPanel.java
@@ -8,6 +8,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.roots.RootPolicy;
import com.intellij.ui.treeStructure.Tree;
+import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.hash.HashMap;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -25,6 +26,8 @@ import org.jetbrains.plugins.gradle.util.GradleConstants;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeNode;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collection;
@@ -51,6 +54,9 @@ public class GradleProjectStructureChangesPanel extends GradleToolWindowPanel {
*/
private final Map myModuleDependencies = new HashMap();
private final Map myModules = new HashMap();
+
+ private final TreeNode[] myNodeHolder = new TreeNode[1];
+ private final int[] myIndexHolder = new int[1];
private final GradleProjectStructureChangesModel myChangesModel;
@@ -62,11 +68,15 @@ public class GradleProjectStructureChangesPanel extends GradleToolWindowPanel {
myChangesModel = model;
myChangesModel.addListener(new GradleProjectStructureChangeListener() {
@Override
- public void onChanges(@NotNull final Collection changes) {
+ public void onChanges(@NotNull final Collection oldChanges,
+ @NotNull final Collection currentChanges)
+ {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
- updateTree(changes);
+ updateTree(currentChanges);
+ processObsoleteChanges(ContainerUtil.subtract(oldChanges, currentChanges));
+
}
});
}
@@ -84,6 +94,7 @@ public class GradleProjectStructureChangesPanel extends GradleToolWindowPanel {
constraints.fill = GridBagConstraints.BOTH;
constraints.weightx = constraints.weighty = 1;
myContent.add(tree, constraints);
+ myContent.setBackground(tree.getBackground());
return treeModel;
}
@@ -237,4 +248,83 @@ public class GradleProjectStructureChangesPanel extends GradleToolWindowPanel {
});
}
}
+
+ /**
+ * Updates the tree state considering that the given changes are obsolete.
+ *
+ * Example:
+ *
+ *
+ * - There is a particular intellij-local library (change from the gradle project structure);
+ * - Corresponding node is shown at the current UI;
+ * - The library is removed, i.e. corresponding change has become obsolete;
+ * - This method is notified within the obsolete change and is expected to remove the corresponding node;
+ *
+ *
+ */
+ private void processObsoleteChanges(Collection changes) {
+ for (GradleProjectStructureChange change : changes) {
+ change.invite(new GradleProjectStructureChangeVisitor() {
+ @Override
+ public void visit(@NotNull GradleRenameChange change) {
+ // TODO den implement
+ }
+
+ @Override
+ public void visit(@NotNull GradleProjectStructureChange change) {
+ // TODO den implement
+ }
+
+ @Override
+ public void visit(@NotNull GradleModulePresenceChange change) {
+ // TODO den implement
+ }
+
+ @Override
+ public void visit(@NotNull GradleLibraryDependencyPresenceChange change) {
+ // We need to remove the corresponding node then.
+ String moduleName;
+ Object library;
+ final GradleLibraryDependency gradleEntity = change.getGradleEntity();
+ final LibraryOrderEntry intellijEntity = change.getIntellijEntity();
+ assert gradleEntity != null || intellijEntity != null;
+ if (gradleEntity == null) {
+ moduleName = intellijEntity.getOwnerModule().getName();
+ library = intellijEntity;
+ }
+ else {
+ moduleName = gradleEntity.getOwnerModule().getName();
+ library = gradleEntity;
+ }
+ final DefaultMutableTreeNode holder = myModuleDependencies.get(moduleName);
+ if (holder == null) {
+ return;
+ }
+ for (DefaultMutableTreeNode node = holder.getFirstLeaf(); node != null; node = node.getNextSibling()) {
+ GradleProjectStructureNodeDescriptor descriptor = (GradleProjectStructureNodeDescriptor)node.getUserObject();
+ if (descriptor.getElement().equals(library)) {
+ removeNode(node);
+ return;
+ }
+ }
+ }
+ });
+ }
+ }
+
+ private void removeNode(@NotNull TreeNode node) {
+ final MutableTreeNode parent = (MutableTreeNode)node.getParent();
+ if (parent == null) {
+ return;
+ }
+ int i = parent.getIndex(node);
+ if (i <= 0) {
+ assert false : node;
+ return;
+ }
+ parent.remove(i);
+ myIndexHolder[0] = i;
+ myNodeHolder[0] = node;
+ myTreeModel.nodesWereRemoved(parent, myIndexHolder, myNodeHolder);
+ }
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
index a8d7bd868f8e..ff8f163eb147 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/task/GradleResolveProjectTask.java
@@ -43,7 +43,12 @@ public class GradleResolveProjectTask extends AbstractGradleTask {
return;
}
final GradleProjectStructureChangesModel model = myIntellijProject.getComponent(GradleProjectStructureChangesModel.class);
- model.update(project);
+ if (model != null) {
+ // This task may be called during the 'import from gradle' processing, hence, no project-level IoC is up.
+ // Model update is necessary for the correct tool window project structure diff showing but we don't have
+ // gradle tool window on this stage.
+ model.update(project);
+ }
}
@Nullable
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
new file mode 100644
index 000000000000..abe61ee80f15
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
@@ -0,0 +1,76 @@
+package org.jetbrains.plugins.gradle.sync;
+
+
+import com.intellij.openapi.project.Project
+import org.jetbrains.plugins.gradle.testutil.ChangeBuilder
+import org.jetbrains.plugins.gradle.testutil.GradleProjectBuilder
+import org.jetbrains.plugins.gradle.testutil.IntellijProjectBuilder
+import org.junit.Before
+import org.junit.Test
+import org.picocontainer.defaults.DefaultPicoContainer
+import org.jetbrains.plugins.gradle.diff.*
+import static org.junit.Assert.assertEquals
+
+/**
+ * @author Denis Zhdanov
+ * @since 01/25/2012
+ */
+public class GradleProjectStructureChangesModelTest {
+
+ private GradleProjectStructureChangesModel myModel;
+ def gradle;
+ def intellij;
+ def changes;
+
+ @Before
+ public void setUp() {
+ gradle = new GradleProjectBuilder()
+ intellij = new IntellijProjectBuilder()
+ changes = new ChangeBuilder()
+ def container = new DefaultPicoContainer()
+ container.registerComponentInstance(Project, intellij.project)
+ container.registerComponentInstance(GradleProjectStructureHelper, intellij.projectStructureHelper as GradleProjectStructureHelper)
+ container.registerComponentImplementation(GradleProjectStructureChangesModel)
+ container.registerComponentImplementation(GradleStructureChangesCalculator, GradleProjectStructureChangesCalculator)
+ container.registerComponentImplementation(GradleModuleStructureChangesCalculator)
+ container.registerComponentImplementation(GradleLibraryDependencyStructureChangesCalculator)
+
+ myModel = container.getComponentInstance(GradleProjectStructureChangesModel.class) as GradleProjectStructureChangesModel
+ }
+
+ @Test
+ public void mergeGradleLocalToIntellij() {
+ gradle {
+ module {
+ dependencies {
+ lib(name: "lib1")
+ lib(name: "lib2")
+ } } }
+
+ intellij {
+ module {
+ dependencies {
+ lib(name: "lib1")
+ } } }
+
+ myModel.update(gradle.project)
+ checkChanges {
+ presence {
+ lib(gradle: gradle.modules.dependencies.flatten().findAll { it.name == "lib2" })
+ }
+ }
+
+ gradle {
+ module {
+ dependencies {
+ lib(name: "lib1")
+ } } }
+ myModel.update(gradle.project)
+ assertEquals([].toSet(), myModel.changes)
+ }
+
+ private def checkChanges(c) {
+ c.delegate = changes
+ assertEquals(c(), myModel.changes)
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy
new file mode 100644
index 000000000000..6e4d1f3fd140
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractProjectBuilder.groovy
@@ -0,0 +1,68 @@
+package org.jetbrains.plugins.gradle.testutil
+
+import com.intellij.pom.java.LanguageLevel;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/25/12 4:06 PM
+ */
+public abstract class AbstractProjectBuilder extends BuilderSupport {
+
+ private static final def SAME_TOKEN = "same"
+ private static int COUNTER
+
+ def project
+ def modules = []
+ def libraries = [:].withDefault { createLibrary(it.name?: same, it.paths?: [:]) }
+ def dependencies = [:].withDefault {[]}
+
+ @Override
+ protected void setParent(Object parent, Object child) {
+ }
+
+ @Override
+ protected Object createNode(Object name) {
+ switch (name) {
+ case "call": return createNode("project", [name: same])
+ case "module": return createNode(name, [name: same])
+ case "dependencies": return getCurrent() // Assuming that 'current' is a module object
+ }
+ }
+
+ @Override
+ protected Object createNode(Object name, Object value) {
+ return null
+ }
+
+ @Override
+ protected Object createNode(Object name, Map attributes) {
+ switch (name) {
+ case "project":
+ reset()
+ return project = createProject(attributes.name?: same, attributes.langLevel?: LanguageLevel.JDK_1_6)
+ case "module": def module = createModule(attributes.name?: same); modules << module; return module
+ case "lib":
+ def module = getCurrent()
+ def dep = createLibraryDependency(module, libraries[attributes])
+ dependencies[module] << dep
+ return dep
+ }
+ }
+
+ @Override
+ protected Object createNode(Object name, Map attributes, Object value) {
+ return null
+ }
+
+ protected abstract def createProject(String name, LanguageLevel languageLevel)
+ protected abstract def createModule(String name)
+ protected abstract def createLibrary(String name, Map paths)
+ protected abstract def createLibraryDependency(module, library)
+
+ protected String getUnique() { "./${COUNTER++}" }
+ protected String getSame() { SAME_TOKEN }
+
+ private def reset() {
+ [modules, dependencies, libraries]*.clear()
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy
new file mode 100644
index 000000000000..700bcac3111a
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ChangeBuilder.groovy
@@ -0,0 +1,47 @@
+package org.jetbrains.plugins.gradle.testutil;
+
+
+import org.jetbrains.plugins.gradle.diff.GradleLibraryDependencyPresenceChange
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/26/12 3:25 PM
+ */
+public class ChangeBuilder extends BuilderSupport {
+
+ def changes = []
+
+ @Override
+ protected void setParent(Object parent, Object child) {
+ }
+
+ @Override
+ protected Object createNode(Object name) {
+ if (current == null) {
+ changes = []
+ }
+ changes
+ }
+
+ @Override
+ protected Object createNode(Object name, Object value) { changes }
+
+ @Override
+ protected Object createNode(Object name, Map attributes) {
+ switch (name) {
+ case "presence": return changes
+ case "lib":
+ changes.addAll attributes.gradle.collect { new GradleLibraryDependencyPresenceChange(it, null)}
+ changes.addAll attributes.intellij.collect { new GradleLibraryDependencyPresenceChange(null, it)}
+ return
+ }
+ }
+
+ @Override
+ protected Object createNode(Object name, Map attributes, Object value) { changes }
+
+ @Override
+ protected Object postNodeCompletion(Object parent, Object node) {
+ parent == null ? changes.toSet() : node
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy
new file mode 100644
index 000000000000..e889543406fa
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/GradleProjectBuilder.groovy
@@ -0,0 +1,46 @@
+package org.jetbrains.plugins.gradle.testutil
+
+import org.jetbrains.plugins.gradle.model.GradleProject
+import org.jetbrains.plugins.gradle.model.GradleModule
+import org.jetbrains.plugins.gradle.model.GradleLibraryDependency
+import org.jetbrains.plugins.gradle.model.GradleLibrary
+import org.jetbrains.plugins.gradle.model.LibraryPathType
+import com.intellij.pom.java.LanguageLevel
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/25/12 1:29 PM
+ */
+class GradleProjectBuilder extends AbstractProjectBuilder {
+
+ @Override
+ protected createProject(String name, LanguageLevel languageLevel) {
+ def result = new GradleProject(same, same)
+ result.name = name
+ result.languageLevel = languageLevel
+ result
+ }
+
+ @Override
+ protected createModule(String name) {
+ def result = new GradleModule(name, unique)
+ project.addModule(result)
+ result
+ }
+
+ @Override
+ protected createLibrary(String name, Map paths) {
+ def result = new GradleLibrary(name)
+ (paths.bin?: [same]).each { result.addPath(LibraryPathType.BINARY, it) }
+ (paths.src?: [same]).each { result.addPath(LibraryPathType.SOURCE, it) }
+ (paths.doc?: [same]).each { result.addPath(LibraryPathType.DOC, it) }
+ result
+ }
+
+ @Override
+ protected createLibraryDependency(module, library) {
+ def result = new GradleLibraryDependency(module, library)
+ module.addDependency(result)
+ result
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
new file mode 100644
index 000000000000..92fad0749c64
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
@@ -0,0 +1,49 @@
+package org.jetbrains.plugins.gradle.testutil
+
+import com.intellij.pom.java.LanguageLevel
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.RootPolicy
+import com.intellij.openapi.roots.libraries.Library
+import com.intellij.openapi.roots.LibraryOrderEntry
+import groovy.mock.interceptor.StubFor
+import com.intellij.openapi.project.Project
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/25/12 3:09 PM
+ */
+class IntellijProjectBuilder extends AbstractProjectBuilder {
+
+ def projectStub = [:]
+ def project = projectStub as Project
+ def projectStructureHelper = [
+ getModules: { modules },
+ getOrderEntries: { dependencies[it] }
+ ]
+
+ @Override
+ protected createProject(String name, LanguageLevel languageLevel) {
+ projectStub.getName = { name }
+ projectStructureHelper.getLanguageLevel = { languageLevel }
+ project
+ }
+
+ @Override
+ protected createModule(String name) {
+ [ getName: { name } ] as Module
+ }
+
+ @Override
+ protected createLibrary(String name, Map paths) {
+ [ getName: { name } ] as Library
+ }
+
+ @Override
+ protected createLibraryDependency(module, library) {
+ def stub = [:]
+ def result = stub as LibraryOrderEntry
+ stub.accept = { policy, defaultValue -> policy.visitLibraryOrderEntry(result, defaultValue) }
+ stub.getLibraryName = { library.name }
+ result
+ }
+}
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
index a6d4607f9cc1..057ab85becf0 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
@@ -16,16 +16,19 @@
package com.intellij.execution.junit;
import com.intellij.execution.CantRunException;
-import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.*;
import com.intellij.execution.testframework.SourceScope;
+import com.intellij.execution.util.JavaParametersUtil;
+import com.intellij.execution.util.ProgramParametersUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.JavaDirectoryService;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.PsiPackage;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopes;
@@ -80,14 +83,8 @@ class TestDirectory extends TestPackage {
@Override
public void checkConfiguration() throws RuntimeConfigurationException {
- if (myConfiguration.isAlternativeJrePathEnabled()) {
- if (myConfiguration.getAlternativeJrePath() == null ||
- myConfiguration.getAlternativeJrePath().length() == 0 ||
- !JavaSdk.checkForJre(myConfiguration.getAlternativeJrePath())) {
- throw new RuntimeConfigurationWarning(
- ExecutionBundle.message("jre.path.is.not.valid.jre.home.error.mesage", myConfiguration.getAlternativeJrePath()));
- }
- }
+ JavaParametersUtil.checkAlternativeJRE(myConfiguration);
+ ProgramParametersUtil.checkWorkingDirectoryExist(myConfiguration, myConfiguration.getProject(), myConfiguration.getConfigurationModule().getModule());
final String dirName = myConfiguration.getPersistentData().getDirName();
if (dirName == null || dirName.isEmpty()) {
throw new RuntimeConfigurationError("Directory is not specified");
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 7c063b643958..b3a288099cb6 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -36,13 +36,13 @@ import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.testframework.*;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.execution.util.JavaParametersUtil;
+import com.intellij.execution.util.ProgramParametersUtil;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.JavaSdkType;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.ex.JavaSdkUtil;
@@ -179,14 +179,8 @@ public abstract class TestObject implements JavaCommandLine {
};
public void checkConfiguration() throws RuntimeConfigurationException{
- if (myConfiguration.isAlternativeJrePathEnabled()){
- if (myConfiguration.getAlternativeJrePath() == null ||
- myConfiguration.getAlternativeJrePath().length() == 0 ||
- !JavaSdk.checkForJre(myConfiguration.getAlternativeJrePath())){
- throw new RuntimeConfigurationWarning(
- ExecutionBundle.message("jre.path.is.not.valid.jre.home.error.mesage", myConfiguration.getAlternativeJrePath()));
- }
- }
+ JavaParametersUtil.checkAlternativeJRE(myConfiguration);
+ ProgramParametersUtil.checkWorkingDirectoryExist(myConfiguration, myConfiguration.getProject(), myConfiguration.getConfigurationModule().getModule());
}
public SourceScope getSourceScope() {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index 9021ecea90b2..52bc39ee1adf 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -29,6 +29,8 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.junit.RefactoringListeners;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.SourceScope;
+import com.intellij.execution.util.JavaParametersUtil;
+import com.intellij.execution.util.ProgramParametersUtil;
import com.intellij.openapi.components.PathMacroManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.SettingsEditor;
@@ -338,6 +340,8 @@ public class TestNGConfiguration extends ModuleBasedConfiguration