mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 558474 - CleanUp deprecated methods in org.eclipse.cdt.ui

Browse source 
Reworked deprecated SubProgressMonitor to SubMonitor (part 1)
Removed NullProgressMonitors, transfered root monitors to function call.


Change-Id: Id9fb063f4265fb4a6fba011621310e02886b0217
Signed-off-by: Sergey Kovalchuk <sergei.kovalchuk@arsysop.ru>
This commit is contained in:
Sergey Kovalchuk 2019-12-31 13:53:42 +03:00 • committed by Jonah Graham
parent caaeb7489d
commit d101914ede
2 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
View file

@ -31,10 +31,9 @@ import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
@ -214,21 +213,14 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement
// ugly, need to make the wizard page run in a non ui thread so that this can go away!!! // ugly, need to make the wizard page run in a non ui thread so that this can go away!!!
getShell().getDisplay().syncExec(() -> { getShell().getDisplay().syncExec(() -> {
IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(monitor -> { IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(monitor -> {
final IProgressMonitor fMonitor; SubMonitor subMonitor = SubMonitor.convert(monitor, CUIPlugin.getResourceString(OP_DESC), 3);
if (monitor == null) { doRunPrologue(subMonitor.split(1));
fMonitor = new NullProgressMonitor();
} else {
fMonitor = monitor;
}
fMonitor.beginTask(CUIPlugin.getResourceString(OP_DESC), 3);
doRunPrologue(new SubProgressMonitor(fMonitor, 1));
try { try {
doRun(new SubProgressMonitor(fMonitor, 1)); doRun(subMonitor.split(1));
} catch (CoreException e) { } catch (CoreException e) {
except[0] = e; except[0] = e;
} }
doRunEpilogue(new SubProgressMonitor(fMonitor, 1)); doRunEpilogue(subMonitor.split(1));
fMonitor.done();
}); });
try { try {
getContainer().run(false, true, op); getContainer().run(false, true, op);

43
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
View file

@ -28,8 +28,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredContentProvider;
@ -445,11 +444,8 @@ public abstract class ConvertProjectWizardPage extends WizardPage {
int totalSelected = selection.length; int totalSelected = selection.length;
if (totalSelected > 0) { if (totalSelected > 0) {
if (monitor == null) { SubMonitor submonitor = SubMonitor.convert(monitor, CUIPlugin.getResourceString(KEY_TITLE), 1);
monitor = new NullProgressMonitor(); convertProjects(selection, submonitor.split(1), projectID);
}
monitor.beginTask(CUIPlugin.getResourceString(KEY_TITLE), 1);
convertProjects(selection, monitor, projectID);
} }
} }
@ -462,11 +458,8 @@ public abstract class ConvertProjectWizardPage extends WizardPage {
int totalSelected = selection.length; int totalSelected = selection.length;
if (totalSelected > 0) { if (totalSelected > 0) {
if (monitor == null) { SubMonitor submonitor = SubMonitor.convert(monitor, CUIPlugin.getResourceString(KEY_TITLE), 1);
monitor = new NullProgressMonitor(); convertProjects(selection, bsId, submonitor.split(1));
}
monitor.beginTask(CUIPlugin.getResourceString(KEY_TITLE), 1);
convertProjects(selection, bsId, monitor);
} }
} }
} }
@ -482,26 +475,20 @@ public abstract class ConvertProjectWizardPage extends WizardPage {
* @throws CoreException * @throws CoreException
*/ */
private void convertProjects(Object[] selected, IProgressMonitor monitor, String projectID) throws CoreException { private void convertProjects(Object[] selected, IProgressMonitor monitor, String projectID) throws CoreException {
monitor.beginTask(CUIPlugin.getResourceString(KEY_CONVERTING), selected.length); SubMonitor subMonitor = SubMonitor.convert(monitor, CUIPlugin.getResourceString(KEY_CONVERTING),
try { selected.length);
for (Object element : selected) { for (Object element : selected) {
IProject project = (IProject) element; IProject project = (IProject) element;
convertProject(project, new SubProgressMonitor(monitor, 1), projectID); convertProject(project, subMonitor.split(1), projectID);
}
} finally {
monitor.done();
} }
} }
private void convertProjects(Object[] selected, String bsId, IProgressMonitor monitor) throws CoreException { private void convertProjects(Object[] selected, String bsId, IProgressMonitor monitor) throws CoreException {
monitor.beginTask(CUIPlugin.getResourceString(KEY_CONVERTING), selected.length); SubMonitor subMonitor = SubMonitor.convert(monitor, CUIPlugin.getResourceString(KEY_CONVERTING),
try { selected.length);
for (Object element : selected) { for (Object element : selected) {
IProject project = (IProject) element; IProject project = (IProject) element;
convertProject(project, bsId, new SubProgressMonitor(monitor, 1)); convertProject(project, bsId, subMonitor.split(1));
}
} finally {
monitor.done();
} }
} }