Make automatic configuration updates configurable per project #1664
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,7 +35,7 @@ | |
| */ | ||
| public class OutOfDateConfigurationDeltaVisitor implements IResourceDeltaVisitor { | ||
|
|
||
| final List<IProject> outOfDateProjects = new ArrayList<>(); | ||
|
|
||
| @Override | ||
| public boolean visit(IResourceDelta delta) throws CoreException { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,8 @@ | |
| */ | ||
| public class MavenPreferenceInitializer extends AbstractPreferenceInitializer { | ||
|
|
||
| public static final boolean P_AUTO_UPDATE_CONFIGURATION_DEFAULT = true; | ||
|
|
||
| @Override | ||
| public void initializeDefaultPreferences() { | ||
| IEclipsePreferences store = DefaultScope.INSTANCE.getNode(IMavenConstants.PLUGIN_ID); | ||
|
|
@@ -63,7 +65,7 @@ public void initializeDefaultPreferences() { | |
| // set to null since the plugin state location is not available by the time execution reaches here | ||
| store.remove(MavenPreferenceConstants.P_WORKSPACE_MAPPINGS_LOCATION); | ||
|
|
||
| store.putBoolean(MavenPreferenceConstants.P_AUTO_UPDATE_CONFIGURATION, P_AUTO_UPDATE_CONFIGURATION_DEFAULT); | ||
|
|
||
| store.putBoolean(MavenPreferenceConstants.P_ENABLE_SNAPSHOT_ARCHETYPES, false); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -885,12 +885,16 @@ public void mavenProjectChanged(List<MavenProjectChangedEvent> events, IProgress | |
|
|
||
| if(facade != null) { | ||
| ProblemSeverity outOfDateSeverity = ProblemSeverity.get(mavenConfiguration.getOutOfDateProjectSeverity()); | ||
| IProject project = facade.getProject(); | ||
| mavenMarkerManager.deleteMarkers(project, IMavenConstants.MARKER_CONFIGURATION_ID); | ||
| if(!ProblemSeverity.ignore.equals(outOfDateSeverity)) { | ||
| LifecycleMappingConfiguration oldConfiguration = LifecycleMappingConfiguration.restore(facade, monitor); | ||
| if(oldConfiguration != null | ||
| && LifecycleMappingFactory.isLifecycleMappingChanged(facade, oldConfiguration, monitor)) { | ||
| if(!ResolverConfigurationIO.isAutomaticallyUpdateConfiguration(project)) { | ||
| outOfDateSeverity = ProblemSeverity.info; | ||
| } | ||
| mavenMarkerManager.addMarker(project, IMavenConstants.MARKER_CONFIGURATION_ID, | ||
| Messages.ProjectConfigurationUpdateRequired, -1, outOfDateSeverity.getSeverity()); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,10 +30,11 @@ | |
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.resources.ProjectScope; | ||
| import org.eclipse.core.runtime.preferences.IEclipsePreferences; | ||
|
|
||
| import org.eclipse.m2e.core.internal.IMavenConstants; | ||
| import org.eclipse.m2e.core.internal.embedder.MavenProperties; | ||
| import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; | ||
| import org.eclipse.m2e.core.internal.preferences.MavenPreferenceInitializer; | ||
| import org.eclipse.m2e.core.project.IProjectConfiguration; | ||
| import org.eclipse.m2e.core.project.ResolverConfiguration; | ||
|
|
||
|
|
@@ -55,6 +56,8 @@ public class ResolverConfigurationIO { | |
| */ | ||
| private static final String P_RESOLVE_WORKSPACE_PROJECTS = "resolveWorkspaceProjects"; //$NON-NLS-1$ | ||
|
|
||
| private static final String P_AUTO_UPDATE_CONFIGURATION = MavenPreferenceConstants.P_AUTO_UPDATE_CONFIGURATION; | ||
|
|
||
| /** | ||
| * Active profiles project preference key. Value is comma-separated list of enabled profiles. | ||
| */ | ||
|
|
@@ -82,13 +85,11 @@ public class ResolverConfigurationIO { | |
| private static final String VERSION = "1"; //$NON-NLS-1$ | ||
|
|
||
| public static boolean saveResolverConfiguration(IProject project, IProjectConfiguration configuration) { | ||
| IEclipsePreferences projectNode = getMavenProjectPreferences(project); | ||
| if(projectNode != null) { | ||
| projectNode.put(P_VERSION, VERSION); | ||
|
|
||
| projectNode.putBoolean(P_RESOLVE_WORKSPACE_PROJECTS, configuration.isResolveWorkspaceProjects()); | ||
| projectNode.put(P_SELECTED_PROFILES, configuration.getSelectedProfiles()); | ||
|
|
||
| if(configuration.getLifecycleMappingId() != null) { | ||
|
|
@@ -101,21 +102,13 @@ public static boolean saveResolverConfiguration(IProject project, IProjectConfig | |
| } else { | ||
| projectNode.remove(P_PROPERTIES); | ||
| } | ||
| return savePreferences(projectNode); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public static IProjectConfiguration readResolverConfiguration(IProject project) { | ||
| IEclipsePreferences projectNode = getMavenProjectPreferences(project); | ||
| if(projectNode == null) { | ||
| return new ResolverConfiguration(project); | ||
| } | ||
|
|
@@ -132,6 +125,34 @@ public static IProjectConfiguration readResolverConfiguration(IProject project) | |
| return configuration; | ||
| } | ||
|
|
||
| public static boolean isAutomaticallyUpdateConfiguration(IProject project) { | ||
| IEclipsePreferences preferences = getMavenProjectPreferences(project); | ||
| boolean defaultValue = MavenPreferenceInitializer.P_AUTO_UPDATE_CONFIGURATION_DEFAULT; | ||
| return preferences != null ? preferences.getBoolean(P_AUTO_UPDATE_CONFIGURATION, defaultValue) : defaultValue; | ||
| } | ||
|
|
||
| public static void setAutomaticallyUpdateConfiguration(IProject project, boolean isAutomaticallyUpdateConfiguration) { | ||
| IEclipsePreferences preferences = getMavenProjectPreferences(project); | ||
| if(preferences != null) { | ||
| preferences.putBoolean(P_AUTO_UPDATE_CONFIGURATION, isAutomaticallyUpdateConfiguration); | ||
| savePreferences(preferences); | ||
| } | ||
| } | ||
|
|
||
| private static IEclipsePreferences getMavenProjectPreferences(IProject project) { | ||
| return new ProjectScope(project).getNode(IMavenConstants.PLUGIN_ID); | ||
| } | ||
|
|
||
| private static boolean savePreferences(IEclipsePreferences node) { | ||
| try { | ||
| node.flush(); | ||
| return true; | ||
| } catch(BackingStoreException ex) { | ||
| log.error("Failed to save resolver configuration", ex); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private static File getBasedir(IEclipsePreferences projectNode, IProject project) { | ||
| String basedirSetting = projectNode.get(P_BASEDIR, null); | ||
| if(basedirSetting != null) { | ||
|
|
@@ -144,9 +165,7 @@ private static File getBasedir(IEclipsePreferences projectNode, IProject project | |
| } | ||
|
|
||
| private static String propertiesAsString(Map<?, ?> properties) { | ||
| return properties.entrySet().stream().map(e -> encodeEntry(e)).collect(Collectors.joining(PROPERTIES_SEPARATOR)); | ||
| } | ||
|
|
||
| private static Properties stringAsProperties(String properties) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This must be removed or disbaled in the workspace can't be changed by a project.