diff options
author | Fuyao Zhao <fuyaoz@google.com> | 2015-08-04 01:26:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-08-04 01:26:06 +0000 |
commit | 4ea4d021da4c2613ff0e3463cfd92283dd31b408 (patch) | |
tree | 41450d06ffb4c4d5a7af02d6b62663a7a6fb37f2 /android/src | |
parent | 42dc035d82d3d4fc7173995ee95617dddd02ea83 (diff) | |
parent | 438da09d424cadfefb41324e0658eb3352d5a066 (diff) | |
download | idea-4ea4d021da4c2613ff0e3463cfd92283dd31b408.tar.gz |
Merge "Undo gradle awared quickfix would be able to automatically trigger gradle sync" into studio-1.4-dev
automerge: 438da09
* commit '438da09d424cadfefb41324e0658eb3352d5a066':
Undo gradle awared quickfix would be able to automatically trigger gradle sync
Diffstat (limited to 'android/src')
-rw-r--r-- | android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java | 1 | ||||
-rw-r--r-- | android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java b/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java index d3722172a90..1cf67ec1a0f 100644 --- a/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java +++ b/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java @@ -168,6 +168,7 @@ public class AddGradleProjectDependencyFix extends GradleDependencyFix { @Override public void run() { addDependency(myCurrentModule, module, test); + registerUndoAction(project); gradleSyncAndImportClass(module, editor, myReference, new Function<Void, List<PsiClass>>() { @Override public List<PsiClass> apply(@Nullable Void input) { diff --git a/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java b/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java index a360b3b3723..9da2bca82d1 100644 --- a/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java +++ b/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java @@ -31,6 +31,9 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.command.undo.BasicUndoableAction; +import com.intellij.openapi.command.undo.UndoManager; +import com.intellij.openapi.command.undo.UnexpectedUndoException; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -120,4 +123,18 @@ abstract class GradleDependencyFix implements IntentionAction, LocalQuickFix, Hi } }); } -}
\ No newline at end of file + + protected static void registerUndoAction(@NotNull final Project project) { + UndoManager.getInstance(project).undoableActionPerformed(new BasicUndoableAction() { + @Override + public void undo() throws UnexpectedUndoException { + GradleProjectImporter.getInstance().requestProjectSync(project, false, null); + } + + @Override + public void redo() throws UnexpectedUndoException { + GradleProjectImporter.getInstance().requestProjectSync(project, false, null); + } + }); + } +} |