Skip to content

Commit

Permalink
Format and clean up ProjectConfigurationManager and MavenImpl and more (
Browse files Browse the repository at this point in the history 
#689)
  • Loading branch information
@HannesWell
HannesWell authored May 13, 2022
1 parent ecabd83 commit bcffba8
Show file tree
Hide file tree
Showing 5 changed files with 211 additions and 264 deletions.
2 changes: 1 addition & 1 deletion m2e-core-tests
Submodule m2e-core-tests updated 6 files
+1 −0 org.eclipse.m2e.tests/META-INF/MANIFEST.MF
+16 −56 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/internal/embedder/EclipseClassRealmManagerDelegateTest.java
+44 −7 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/launch/MavenLaunchDelegateTest.java
+11 −14 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/launch/MavenRuntimeClasspathProviderTest.java
+0 −258 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/mocks/MockLaunchConfiguration.java
+0 −156 org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/mocks/MockLaunchConfigurationType.java
110 changes: 47 additions & 63 deletions ...core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenSettingsPreferencePage.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008, 2019 Sonatype, Inc.
* Copyright (c) 2008, 2022 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand All @@ -24,8 +24,6 @@
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.jobs.Job;
Expand Down Expand Up @@ -113,12 +111,12 @@ public void setVisible(boolean visible) {
}
}

protected void updateSettings(final boolean updateMavenDependencies) {
protected void updateSettings(boolean updateMavenDependencies) {
//Force reevaluation of local repository, in case the settings were modified externally
updateLocalRepository();

final String userSettings = getUserSettings();
final String globalSettings = getGlobalSettings();
String userSettings = getUserSettings();
String globalSettings = getGlobalSettings();

String currentGlobalSettings = mavenConfiguration.getGlobalSettingsFile();
String currentUserSettings = mavenConfiguration.getUserSettingsFile();
Expand All @@ -127,7 +125,7 @@ protected void updateSettings(final boolean updateMavenDependencies) {
return;
}

final Boolean[] updateProjects = new Boolean[1];
Boolean[] updateProjects = new Boolean[1];
updateProjects[0] = updateMavenDependencies;
if(updateMavenDependencies) {
IMavenProjectFacade[] projects = MavenPlugin.getMavenProjectRegistry().getProjects();
Expand All @@ -138,42 +136,35 @@ protected void updateSettings(final boolean updateMavenDependencies) {
}
}

new Job(Messages.MavenSettingsPreferencePage_job_updating) {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
final File localRepositoryDir = new File(maven.getLocalRepository().getBasedir());

// this clears cached settings.xml instance
mavenConfiguration.setGlobalSettingsFile(globalSettings);
mavenConfiguration.setUserSettingsFile(userSettings);

File newRepositoryDir = new File(maven.getLocalRepository().getBasedir());
if(updateProjects[0]) {
IMavenProjectFacade[] projects = MavenPlugin.getMavenProjectRegistry().getProjects();
ArrayList<IProject> allProjects = new ArrayList<>();
if(projects != null && projects.length > 0) {
MavenPlugin.getMaven().reloadSettings();

SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, projects.length);
for(IMavenProjectFacade project : projects) {
subMonitor
.beginTask(NLS.bind(Messages.MavenSettingsPreferencePage_task_updating, project.getProject()
.getName()), 1);
allProjects.add(project.getProject());
}
MavenPlugin.getMavenProjectRegistry().refresh(
new MavenUpdateRequest(allProjects.toArray(new IProject[] {}), mavenConfiguration.isOffline(), true));
subMonitor.done();
Job.create(Messages.MavenSettingsPreferencePage_job_updating, monitor -> {
try {
// this clears cached settings.xml instance
mavenConfiguration.setGlobalSettingsFile(globalSettings);
mavenConfiguration.setUserSettingsFile(userSettings);

if(Boolean.TRUE.equals(updateProjects[0])) {
IMavenProjectFacade[] projects = MavenPlugin.getMavenProjectRegistry().getProjects();
List<IProject> allProjects = new ArrayList<>();
if(projects != null && projects.length > 0) {
MavenPlugin.getMaven().reloadSettings();

SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, projects.length);
for(IMavenProjectFacade project : projects) {
subMonitor.beginTask(
NLS.bind(Messages.MavenSettingsPreferencePage_task_updating, project.getProject().getName()), 1);
allProjects.add(project.getProject());
}
MavenPlugin.getMavenProjectRegistry().refresh(
new MavenUpdateRequest(allProjects.toArray(IProject[]::new), mavenConfiguration.isOffline(), true));
subMonitor.done();
}
return Status.OK_STATUS;
} catch(CoreException e) {
log.error(e.getMessage(), e);
return e.getStatus();
}
return Status.OK_STATUS;
} catch(CoreException e) {
log.error(e.getMessage(), e);
return e.getStatus();
}
}.schedule();
}).schedule();
}

@Override
Expand Down Expand Up @@ -201,12 +192,11 @@ protected Control createContents(Composite parent) {
globalSettingsLink.setText(Messages.MavenSettingsPreferencePage_globalSettingslink2);
globalSettingsLink.setToolTipText(Messages.MavenSettingsPreferencePage_globalSettingslink_tooltip);
globalSettingsLink.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
String globalSettings = getGlobalSettings();
if(globalSettings != null) {
openEditor(globalSettings);
}
String globalSettings = getGlobalSettings();
if(globalSettings != null) {
openEditor(globalSettings);
}
));
}));

globalSettingsText = new Text(composite, SWT.BORDER);
globalSettingsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
Expand Down Expand Up @@ -297,8 +287,8 @@ private void updateGlobalSettingsLink(String globalSettings) {
}

protected void updateLocalRepository() {
final String globalSettings = getGlobalSettings();
final String userSettings = getUserSettings();
String globalSettings = getGlobalSettings();
String userSettings = getUserSettings();
try {
Settings settings = maven.buildSettings(globalSettings, userSettings);
String localRepository = settings.getLocalRepository();
Expand Down Expand Up @@ -328,13 +318,10 @@ protected void checkSettings() {
if(globalSettings != null
&& !checkSettings(globalSettings, Messages.MavenSettingsPreferencePage_error_globalSettingsMissing,
Messages.MavenSettingsPreferencePage_error_globalSettingsParse)) {
return;
}

if(userSettings != null
&& !checkSettings(userSettings, Messages.MavenSettingsPreferencePage_error_userSettingsMissing,
Messages.MavenSettingsPreferencePage_error_userSettingsParse)) {
return;
//work is done in if-condition
} else if(userSettings != null) {
checkSettings(userSettings, Messages.MavenSettingsPreferencePage_error_userSettingsMissing,
Messages.MavenSettingsPreferencePage_error_userSettingsParse);
}
}

Expand All @@ -351,7 +338,7 @@ private boolean checkSettings(String location, String errorMissing, String error
return true;
}

void openEditor(final String fileName) {
void openEditor(String fileName) {
IWorkbench workbench = PlatformUI.getWorkbench();
IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
IWorkbenchPage page = window.getActivePage();
Expand All @@ -360,14 +347,14 @@ void openEditor(final String fileName) {

IEditorInput input = new FileStoreEditorInput(EFS.getLocalFileSystem().fromLocalFile(new File(fileName)));
try {
final IEditorPart editor = IDE.openEditor(page, input, desc.getId());
IEditorPart editor = IDE.openEditor(page, input, desc.getId());
if(editor == null) {
//external editor was opened
return;
}
editor.addPropertyListener((source, propId) -> {
if(!editor.isDirty()) {
log.info("Refreshing settings " + fileName); //$NON-NLS-1$
log.info("Refreshing settings {}", fileName); //$NON-NLS-1$
}
});
} catch(PartInitException ex) {
Expand All @@ -394,13 +381,10 @@ protected void browseSettingsAction(Text settings) {
dialog.setFileName(settings.getText());
}
String file = dialog.open();
if(file != null) {
file = file.trim();
if(file.length() > 0) {
settings.setText(file);
updateLocalRepository();
checkSettings();
}
if(file != null && !file.isBlank()) {
settings.setText(file.strip());
updateLocalRepository();
checkSettings();
}
}
}
Loading

0 comments on commit bcffba8

Please sign in to comment.