MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-324213 remove setting: Use plugin registry

Browse Source 
GitOrigin-RevId: 319862bcbdad14a554dcd275555f40f9b9df36a9
This commit is contained in:
Dmitry Kichinsky
2023-08-30 12:43:26 +02:00
committed by intellij-monorepo-bot
parent 54968e7312
commit f008bf452e
7 changed files with 20 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/run/configuration/MavenRunConfigurationSettingsEditor.kt
View File

@@ -115,7 +115,6 @@ class MavenRunConfigurationSettingsEditor(
addOutputLevelFragment()
addThreadsFragment()
addMultimoduleDirFragment()
addUsePluginRegistryTag()
addPrintStacktracesTag()
addUpdateSnapshotsTag()
addExecuteNonRecursivelyTag()
@@ -266,16 +265,6 @@ class MavenRunConfigurationSettingsEditor(
{ runnerSettingsOrDefault.isSkipTests = it }
)
private fun SettingsEditorFragmentContainer<MavenRunConfiguration>.addUsePluginRegistryTag() =
addTag(
"maven.use.plugin.registry.tag",
MavenConfigurableBundle.message("maven.settings.general.use.plugin.registry"),
MavenConfigurableBundle.message("maven.run.configuration.general.options.group"),
MavenConfigurableBundle.message("maven.settings.general.use.plugin.registry.tooltip"),
{ generalSettingsOrDefault.isUsePluginRegistry },
{ generalSettingsOrDefault.isUsePluginRegistry = it }
)
private fun SettingsEditorFragmentContainer<MavenRunConfiguration>.addPrintStacktracesTag() =
addTag(
"maven.print.stacktraces.tag",

48
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.form
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.maven.project.MavenGeneralPanel">
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="14" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="13" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="1768" height="569"/>
@@ -10,7 +10,7 @@
<children>
<component id="5e65f" class="javax.swing.JLabel">
<constraints>
<grid row="6" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
<grid row="5" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="66" height="23"/>
</grid>
</constraints>
@@ -21,13 +21,13 @@
</component>
<component id="ca510" class="javax.swing.JComboBox" binding="outputLevelCombo">
<constraints>
<grid row="6" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="5" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="cd5e1" class="javax.swing.JLabel">
<constraints>
<grid row="7" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="6" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="14e1e"/>
@@ -36,13 +36,13 @@
</component>
<component id="14e1e" class="javax.swing.JComboBox" binding="checksumPolicyCombo">
<constraints>
<grid row="7" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="6" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="83fac" class="com.intellij.ui.components.JBLabel" binding="myMultiProjectBuildFailPolicyLabel">
<constraints>
<grid row="8" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="7" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelFor value="c58ed"/>
@@ -51,7 +51,7 @@
</component>
<component id="c58ed" class="javax.swing.JComboBox" binding="failPolicyCombo">
<constraints>
<grid row="8" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="7" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
@@ -65,19 +65,9 @@
<toolTipText resource-bundle="messages/MavenConfigurableBundle" key="maven.settings.general.work.offline.tooltip"/>
</properties>
</component>
<component id="2d2f9" class="javax.swing.JCheckBox" binding="checkboxUsePluginRegistry">
<constraints>
<grid row="1" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="0" bottom="2" right="3"/>
<text resource-bundle="messages/MavenConfigurableBundle" key="maven.settings.general.use.plugin.registry"/>
<toolTipText resource-bundle="messages/MavenConfigurableBundle" key="maven.settings.general.use.plugin.registry.tooltip"/>
</properties>
</component>
<component id="86396" class="javax.swing.JCheckBox" binding="checkboxRecursive">
<constraints>
<grid row="2" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<grid row="1" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="185" height="22"/>
</grid>
</constraints>
@@ -89,7 +79,7 @@
</component>
<component id="6fd1" class="javax.swing.JCheckBox" binding="checkboxProduceExceptionErrorMessages">
<constraints>
<grid row="3" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<alignmentY value="0.5"/>
@@ -100,17 +90,17 @@
</component>
<nested-form id="3edfe" form-file="org/jetbrains/idea/maven/project/MavenEnvironmentForm.form" binding="mavenPathsForm">
<constraints>
<grid row="10" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
<grid row="9" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</nested-form>
<hspacer id="38d7a">
<constraints>
<grid row="6" column="5" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="5" column="5" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="6c527" class="javax.swing.JCheckBox" binding="alwaysUpdateSnapshotsCheckBox" default-binding="true">
<constraints>
<grid row="4" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="6" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="0" bottom="2" right="3"/>
@@ -120,7 +110,7 @@
</component>
<component id="71ae2" class="com.intellij.ui.components.JBLabel">
<constraints>
<grid row="9" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="8" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<horizontalAlignment value="10"/>
@@ -132,7 +122,7 @@
</component>
<component id="79cd1" class="javax.swing.JTextField" binding="threadsEditor">
<constraints>
<grid row="9" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false">
<grid row="8" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="0" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
@@ -140,7 +130,7 @@
</component>
<component id="5bf84" class="com.intellij.ui.components.JBLabel">
<constraints>
<grid row="9" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="8" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<componentStyle value="SMALL"/>
@@ -149,7 +139,7 @@
</component>
<component id="626a7" class="javax.swing.JCheckBox" binding="showDialogWithAdvancedSettingsCheckBox">
<constraints>
<grid row="5" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/MavenConfigurableBundle" key="maven.settings.environment.show.advanced.settings"/>
@@ -158,7 +148,7 @@
</component>
<component id="88b6d" class="javax.swing.JCheckBox" binding="useMavenConfigCheckBox">
<constraints>
<grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/MavenConfigurableBundle" key="maven.settings.environment.use.maven.config.settings"/>
@@ -167,13 +157,13 @@
</component>
<vspacer id="9cb69">
<constraints>
<grid row="13" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="12" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<grid id="ff9b1" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="12" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="11" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>

3
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java
View File

@@ -29,7 +29,6 @@ public class MavenGeneralPanel implements PanelWithAnchor {
private JCheckBox checkboxProduceExceptionErrorMessages;
private JComboBox checksumPolicyCombo;
private JComboBox failPolicyCombo;
private JCheckBox checkboxUsePluginRegistry;
private JCheckBox checkboxRecursive;
private MavenEnvironmentForm mavenPathsForm;
private JBLabel myMultiProjectBuildFailPolicyLabel;
@@ -96,7 +95,6 @@ public class MavenGeneralPanel implements PanelWithAnchor {
mavenPathsForm.setData(data);
data.setPrintErrorStackTraces(checkboxProduceExceptionErrorMessages.isSelected());
data.setUsePluginRegistry(checkboxUsePluginRegistry.isSelected());
data.setNonRecursive(!checkboxRecursive.isSelected());
data.setOutputLevel((MavenExecutionOptions.LoggingLevel)ComboBoxUtil.getSelectedValue(outputLevelComboModel));
@@ -121,7 +119,6 @@ public class MavenGeneralPanel implements PanelWithAnchor {
mavenPathsForm.initializeFormData(data, project);
checkboxProduceExceptionErrorMessages.setSelected(data.isPrintErrorStackTraces());
checkboxUsePluginRegistry.setSelected(data.isUsePluginRegistry());
checkboxRecursive.setSelected(!data.isNonRecursive());
alwaysUpdateSnapshotsCheckBox.setSelected(data.isAlwaysUpdateSnapshots());
threadsEditor.setText(StringUtil.notNullize(data.getThreads()));

14
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java
View File

@@ -37,7 +37,6 @@ public class MavenGeneralSettings implements Cloneable {
private String mavenSettingsFile = "";
private String overriddenLocalRepository = "";
private boolean printErrorStackTraces = false;
private boolean usePluginRegistry = false;
private boolean nonRecursive = false;
private boolean alwaysUpdateSnapshots = false;
private boolean showDialogWithAdvancedSettings = false;
@@ -294,17 +293,6 @@ public class MavenGeneralSettings implements Cloneable {
}
}
public boolean isUsePluginRegistry() {
return usePluginRegistry;
}
public void setUsePluginRegistry(final boolean value) {
if (!Comparing.equal(this.usePluginRegistry, value)) {
this.usePluginRegistry = value;
changed();
}
}
public boolean isUseMavenConfig() {
return useMavenConfig;
}
@@ -384,7 +372,6 @@ public class MavenGeneralSettings implements Cloneable {
if (alwaysUpdateSnapshots != that.alwaysUpdateSnapshots) return false;
if (showDialogWithAdvancedSettings != that.showDialogWithAdvancedSettings) return false;
if (printErrorStackTraces != that.printErrorStackTraces) return false;
if (usePluginRegistry != that.usePluginRegistry) return false;
if (useMavenConfig != that.useMavenConfig) return false;
if (workOffline != that.workOffline) return false;
if (!checksumPolicy.equals(that.checksumPolicy)) return false;
@@ -405,7 +392,6 @@ public class MavenGeneralSettings implements Cloneable {
result = 31 * result + mavenSettingsFile.hashCode();
result = 31 * result + overriddenLocalRepository.hashCode();
result = 31 * result + (printErrorStackTraces ? 1 : 0);
result = 31 * result + (usePluginRegistry ? 1 : 0);
result = 31 * result + (useMavenConfig ? 1 : 0);
result = 31 * result + (nonRecursive ? 1 : 0);
result = 31 * result + outputLevel.hashCode();

4
plugins/maven/src/main/java/org/jetbrains/idea/maven/statistics/MavenSettingsCollector.kt
View File

@@ -41,7 +41,6 @@ class MavenSettingsCollector : ProjectUsagesCollector() {
usages.add(ALWAYS_UPDATE_SNAPSHOTS.metric(generalSettings.isAlwaysUpdateSnapshots))
usages.add(NON_RECURSIVE.metric(generalSettings.isNonRecursive))
usages.add(PRINT_ERROR_STACK_TRACES.metric(generalSettings.isPrintErrorStackTraces))
usages.add(USE_PLUGIN_REGISTRY.metric(generalSettings.isUsePluginRegistry))
usages.add(WORK_OFFLINE.metric(generalSettings.isWorkOffline))
usages.add(OUTPUT_LEVEL.metric(generalSettings.outputLevel))
@Suppress("DEPRECATION")
@@ -102,12 +101,11 @@ class MavenSettingsCollector : ProjectUsagesCollector() {
}
companion object {
private val GROUP = EventLogGroup("build.maven.state", 9)
private val GROUP = EventLogGroup("build.maven.state", 10)
private val HAS_MAVEN_PROJECT = GROUP.registerEvent("hasMavenProject", EventFields.Enabled)
private val ALWAYS_UPDATE_SNAPSHOTS = GROUP.registerEvent("alwaysUpdateSnapshots", EventFields.Enabled)
private val NON_RECURSIVE = GROUP.registerEvent("nonRecursive", EventFields.Enabled)
private val PRINT_ERROR_STACK_TRACES = GROUP.registerEvent("printErrorStackTraces", EventFields.Enabled)
private val USE_PLUGIN_REGISTRY = GROUP.registerEvent("usePluginRegistry", EventFields.Enabled)
private val WORK_OFFLINE = GROUP.registerEvent("workOffline", EventFields.Enabled)
private val LOCAL_REPOSITORY = GROUP.registerEvent("localRepository", EventFields.Enabled)
private val USER_SETTINGS_FILE = GROUP.registerEvent("userSettingsFile", EventFields.Enabled)

2
plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties
View File

@@ -14,8 +14,6 @@ maven.settings.environment.use.maven.config.settings.hint=<html>Any changes made
maven.settings.general.work.offline=Work &offline
maven.settings.general.work.offline.tooltip=<html>Add option <b>--offline</b> to command line when run maven goals</html>
maven.settings.general.use.plugin.registry=Use plugin &registry
maven.settings.general.use.plugin.registry.tooltip=<html>Add option <b>--no-plugin-registry</b> if this option is not selected</html>
maven.settings.general.execute.recursively=Execute &goals recursively
maven.settings.general.execute.non.recursively=Execute &goals non recursively
maven.settings.general.execute.recursively.tooltip=<html>Add option <b>--non-recursive</b> if this option is not selected</html>

3
resources-en/resources/search/searchableOptions.xml
View File

@@ -33794,9 +33794,6 @@
<option name="print" hit="Print exception stack traces" />
<option name="stack" hit="Print exception stack traces" />
<option name="traces" hit="Print exception stack traces" />
<option name="plugin" hit="Use plugin registry" />
<option name="registry" hit="Use plugin registry" />
<option name="use" hit="Use plugin registry" />
<option name="file" hit="User settings file:" />
<option name="settings" hit="User settings file:" />
<option name="user" hit="User settings file:" />