From 47bb3d8475ae5c447f5f5748cecc51fe6c864168 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 15 May 2019 15:18:58 +0200 Subject: [PATCH] IDEA-210281 Cleanup Gradle settings: wording GitOrigin-RevId: e177da5281bb344dcc1722a5155b849aadb4e317 --- .../IdeaGradleProjectSettingsControlBuilder.java | 10 ++++------ .../IdeaGradleSystemSettingsControlBuilder.java | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java index ea55fb0a98cb..9a487b12dc8e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java @@ -305,8 +305,7 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet ExternalSystemUiUtil.getFillLineConstraints(indentLevel)); JBLabel label = new JBLabel( - XmlStringUtil.wrapInHtml(getIDEName() + " generates module per source set to correctly model Gradle dependency rules.
" + - "In case of ???? consider disabling it"), + XmlStringUtil.wrapInHtml("Disable to ???"), UIUtil.ComponentStyle.SMALL); label.setForeground(UIUtil.getLabelFontColor(UIUtil.FontColor.BRIGHTER)); @@ -726,10 +725,9 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet JBLabel label = new JBLabel( XmlStringUtil.wrapInHtml( - getIDEName() + " uses Gradle to build the project and run the tasks, " + - "to ensure that the results are the same as in the command line.

" + - "In a pure Java/Kotlin project, building by means of the IDE might be faster, thanks for the incremental compilation. " + - "Note, that the IDE compiler doesn’t support all Gradle features and the behavior might differ"), + "By default " + getIDEName() + " uses Gradle to build the project and run the tasks.

" + + "In a pure Java/Kotlin project, building and running by means of the IDE might be faster, thanks to the optimizations. " + + "Note, that the IDE doesn’t support all Gradle features and the behavior might differ"), UIUtil.ComponentStyle.SMALL); label.setForeground(UIUtil.getLabelFontColor(UIUtil.FontColor.BRIGHTER)); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleSystemSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleSystemSettingsControlBuilder.java index a2c9ed35ddf9..5a0ab26248c4 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleSystemSettingsControlBuilder.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleSystemSettingsControlBuilder.java @@ -96,8 +96,7 @@ public class IdeaGradleSystemSettingsControlBuilder implements GradleSystemSetti canvas.add(myGenerateImlFilesCheckBox, ExternalSystemUiUtil.getFillLineConstraints(indentLevel)); myGenerateImlFilesHint = new JBLabel( - XmlStringUtil.wrapInHtml("By default, project files (e.g. '.iml') are not generated, as all information is imported from Gradle scripts.\n" + - "Enabled this option, if you need to manually configure the imported modules (e.g. add Facets) and to share these settings via VCS\n"), + XmlStringUtil.wrapInHtml("Enable, if you need to manually configure the imported project in the IDE (e.g. add Facets) and to share these settings via VCS\n"), UIUtil.ComponentStyle.SMALL); myGenerateImlFilesHint.setForeground(UIUtil.getLabelFontColor(UIUtil.FontColor.BRIGHTER)); @@ -208,7 +207,7 @@ public class IdeaGradleSystemSettingsControlBuilder implements GradleSystemSetti myServiceDirectoryLabel = new JBLabel("Gradle user home:"); myServiceDirectoryHint = new JBLabel( - XmlStringUtil.wrapInHtml("You can override the location where Gradle stores downloaded files, " + + XmlStringUtil.wrapInHtml("Override the default location where Gradle stores downloaded files, " + "e.g. to tune anti-virus software on Windows"), UIUtil.ComponentStyle.SMALL); myServiceDirectoryHint.setForeground(UIUtil.getLabelFontColor(UIUtil.FontColor.BRIGHTER));