Merge remote-tracking branch 'origin/master'

# Conflicts:
#	maven-impl/src/main/java/org/jetbrains/plugins/gradle/integrations/maven/action/AddGradleDslDependencyAction.java
#	plugin/src/main/java/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginAction.java

Author: VISTALL

maven-impl/src/main/java/org/jetbrains/plugins/gradle/integrations/maven/action/AddGradleDslDependencyAction.java

@@ -19,7 +19,6 @@
 import consulo.annotation.component.ActionImpl;
 import consulo.annotation.component.ActionParentRef;
 import consulo.annotation.component.ActionRef;
-import consulo.application.AllIcons;
 import consulo.codeEditor.Editor;
 import consulo.gradle.GradleConstants;
 import consulo.gradle.localize.GradleLocalize;
@@ -28,6 +27,7 @@
 import consulo.language.psi.PsiCompiledElement;
 import consulo.language.psi.PsiFile;
 import consulo.maven.rt.server.common.model.MavenId;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.Project;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 
@@ -43,9 +43,9 @@ public class AddGradleDslDependencyAction extends CodeInsightAction {
     static final ThreadLocal<List<MavenId>> TEST_THREAD_LOCAL = new ThreadLocal<>();
 
     public AddGradleDslDependencyAction() {
-        getTemplatePresentation().setDescription(GradleLocalize.gradleCodeinsightActionAdd_maven_dependencyDescription());
         getTemplatePresentation().setText(GradleLocalize.gradleCodeinsightActionAdd_maven_dependencyText());
-        getTemplatePresentation().setIcon(AllIcons.Nodes.PpLib);
+        getTemplatePresentation().setDescription(GradleLocalize.gradleCodeinsightActionAdd_maven_dependencyDescription());
+        getTemplatePresentation().setIcon(PlatformIconGroup.nodesPplib());
     }
 
     @Nonnull

plugin/src/main/java/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginAction.java

@@ -20,7 +20,6 @@
 import consulo.annotation.component.ActionParentRef;
 import consulo.annotation.component.ActionRef;
 import consulo.annotation.component.ActionRefAnchor;
-import consulo.application.AllIcons;
 import consulo.codeEditor.Editor;
 import consulo.gradle.GradleConstants;
 import consulo.gradle.GradleDocumentationBundle;
@@ -29,6 +28,7 @@
 import consulo.language.editor.action.CodeInsightActionHandler;
 import consulo.language.psi.PsiCompiledElement;
 import consulo.language.psi.PsiFile;
+import consulo.platform.base.icon.PlatformIconGroup;
 import consulo.project.Project;
 import consulo.util.collection.ContainerUtil;
 import consulo.util.lang.Couple;
@@ -52,9 +52,9 @@ public class AddGradleDslPluginAction extends CodeInsightAction {
     private final Pair[] myPlugins;
 
     public AddGradleDslPluginAction() {
-        getTemplatePresentation().setDescription(GradleLocalize.gradleCodeinsightActionApply_pluginDescription());
         getTemplatePresentation().setText(GradleLocalize.gradleCodeinsightActionApply_pluginText());
-        getTemplatePresentation().setIcon(AllIcons.Nodes.Plugin);
+        getTemplatePresentation().setDescription(GradleLocalize.gradleCodeinsightActionApply_pluginDescription());
+        getTemplatePresentation().setIcon(PlatformIconGroup.nodesPlugin());
 
         final List<String> plugins = StringUtil.split(
             "java,groovy,idea,eclipse,scala,antlr,application,ear,jetty,maven,osgi,war,announce," +

plugin/src/main/java/org/jetbrains/plugins/gradle/service/settings/GradleProjectSettingsControl.java

@@ -23,7 +23,6 @@
 import consulo.externalSystem.ui.awt.ExternalSystemUiUtil;
 import consulo.externalSystem.ui.awt.PaintAwarePanel;
 import consulo.fileChooser.FileChooserDescriptor;
-import consulo.gradle.GradleBundle;
 import consulo.gradle.GradleConstants;
 import consulo.gradle.localize.GradleLocalize;
 import consulo.gradle.setting.DistributionType;
@@ -200,12 +199,12 @@ public boolean validate(@Nonnull GradleProjectSettings settings) throws Configur
         if (myUseLocalDistributionButton.isSelected()) {
             if (StringUtil.isEmpty(gradleHomePath)) {
                 myGradleHomeSettingType = LocationSettingType.UNKNOWN;
-                throw new ConfigurationException(GradleBundle.message("gradle.home.setting.type.explicit.empty", gradleHomePath));
+                throw new ConfigurationException(GradleLocalize.gradleHomeSettingTypeExplicitEmpty());
             }
             else if (!myInstallationManager.isGradleSdkHome(new File(gradleHomePath))) {
                 myGradleHomeSettingType = LocationSettingType.EXPLICIT_INCORRECT;
                 new DelayedBalloonInfo(NotificationType.ERROR, myGradleHomeSettingType, 0).run();
-                throw new ConfigurationException(GradleLocalize.gradleHomeSettingTypeExplicitIncorrect(gradleHomePath).get());
+                throw new ConfigurationException(GradleLocalize.gradleHomeSettingTypeExplicitIncorrect(gradleHomePath));
             }
         }
         return true;