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 usages of SubProgressMonitor by SubMonitor


Change-Id: Ia67926e1273785d9688ca22c993f79ac3b3822f9
Signed-off-by: Sergey Kovalchuk <sergei.kovalchuk@arsysop.ru>
This commit is contained in:
Sergey Kovalchuk 2020-01-04 17:12:08 +03:00
parent bacb42110e
commit a7c5168c7a
5 changed files with 40 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java
View file

@ -36,9 +36,8 @@ import org.eclipse.core.resources.IResource;
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.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
/** /**
* Abstract block for C/C++ Project Paths page for 3.X projects. * Abstract block for C/C++ Project Paths page for 3.X projects.
@ -295,8 +294,8 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple
protected void internalConfigureCProject(List<CPElement> cPathEntries, IProgressMonitor monitor) protected void internalConfigureCProject(List<CPElement> cPathEntries, IProgressMonitor monitor)
throws CoreException, InterruptedException { throws CoreException, InterruptedException {
// 10 monitor steps to go // 10 monitor steps to go
SubMonitor subMonitor = SubMonitor.convert(monitor, 10);
monitor.worked(2); subMonitor.worked(2);
IPathEntry[] entries = getCProject().getRawPathEntries(); IPathEntry[] entries = getCProject().getRawPathEntries();
@ -332,26 +331,15 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple
cpath.add(entrie); cpath.add(entrie);
} }
} }
monitor.worked(1); subMonitor.worked(1);
getCProject().setRawPathEntries(cpath.toArray(new IPathEntry[cpath.size()]), subMonitor.split(7));
getCProject().setRawPathEntries(cpath.toArray(new IPathEntry[cpath.size()]),
new SubProgressMonitor(monitor, 7));
} }
// -------- creation ------------------------------- // -------- creation -------------------------------
public void configureCProject(IProgressMonitor monitor) throws CoreException, InterruptedException { public void configureCProject(IProgressMonitor monitor) throws CoreException, InterruptedException {
if (monitor == null) { SubMonitor subMonitor = SubMonitor.convert(monitor, CPathEntryMessages.CPathsBlock_operationdesc_c, 10);
monitor = new NullProgressMonitor(); internalConfigureCProject(getCPaths(), subMonitor.split(10));
}
monitor.setTaskName(CPathEntryMessages.CPathsBlock_operationdesc_c);
monitor.beginTask("", 10); //$NON-NLS-1$
try {
internalConfigureCProject(getCPaths(), monitor);
initializeTimeStamps(); initializeTimeStamps();
} finally {
monitor.done();
}
} }
} }

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java
View file

@ -32,7 +32,7 @@ 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.MultiStatus; import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
@ -99,14 +99,14 @@ public class FileTransferDragAdapter implements TransferDragSourceListener {
@Override @Override
public void execute(IProgressMonitor monitor) throws CoreException { public void execute(IProgressMonitor monitor) throws CoreException {
try { SubMonitor subMonitor = SubMonitor.convert(monitor, CUIMessages.FileTransferDragAdapter_refreshing,
monitor.beginTask(CUIMessages.FileTransferDragAdapter_refreshing, roots.size()); roots.size());
MultiStatus status = new MultiStatus(CUIPlugin.getPluginId(), IStatus.OK, MultiStatus status = new MultiStatus(CUIPlugin.getPluginId(), IStatus.OK,
CUIMessages.FileTransferDragAdapter_problem, null); CUIMessages.FileTransferDragAdapter_problem, null);
for (IResource resource : roots) { for (IResource resource : roots) {
try { try {
resource.refreshLocal(IResource.DEPTH_ONE, new SubProgressMonitor(monitor, 1)); resource.refreshLocal(IResource.DEPTH_ONE, subMonitor.split(1));
} catch (CoreException e) { } catch (CoreException e) {
status.add(e.getStatus()); status.add(e.getStatus());
} }
@ -114,9 +114,6 @@ public class FileTransferDragAdapter implements TransferDragSourceListener {
if (!status.isOK()) if (!status.isOK())
throw new CoreException(status); throw new CoreException(status);
} finally {
monitor.done();
}
} }
} }

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/AbstractCElementRenameChange.java
View file

@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
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.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.resource.ResourceChange; import org.eclipse.ltk.core.refactoring.resource.ResourceChange;
@ -78,19 +78,15 @@ public abstract class AbstractCElementRenameChange extends ResourceChange {
@Override @Override
public final Change perform(IProgressMonitor pm) throws CoreException { public final Change perform(IProgressMonitor pm) throws CoreException {
try { SubMonitor subMonitor = SubMonitor.convert(pm, Messages.AbstractCElementRenameChange_renaming, 1);
pm.beginTask(Messages.AbstractCElementRenameChange_renaming, 1);
IResource resource = getResource(); IResource resource = getResource();
IPath newPath = createNewPath(); IPath newPath = createNewPath();
Change result = createUndoChange(resource.getModificationStamp()); Change result = createUndoChange(resource.getModificationStamp());
doRename(new SubProgressMonitor(pm, 1)); doRename(subMonitor.split(1));
if (fStampToRestore != IResource.NULL_STAMP) { if (fStampToRestore != IResource.NULL_STAMP) {
IResource newResource = ResourcesPlugin.getWorkspace().getRoot().findMember(newPath); IResource newResource = ResourcesPlugin.getWorkspace().getRoot().findMember(newPath);
newResource.revertModificationStamp(fStampToRestore); newResource.revertModificationStamp(fStampToRestore);
} }
return result; return result;
} finally {
pm.done();
}
} }
} }

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/changes/CreateFileChange.java
View file

@ -26,7 +26,7 @@ import org.eclipse.core.runtime.CoreException;
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.OperationCanceledException; import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatus;
import org.eclipse.ltk.core.refactoring.resource.ResourceChange; import org.eclipse.ltk.core.refactoring.resource.ResourceChange;
@ -93,11 +93,12 @@ public class CreateFileChange extends ResourceChange {
@Override @Override
public Change perform(IProgressMonitor pm) throws CoreException { public Change perform(IProgressMonitor pm) throws CoreException {
SubMonitor subMonitor = SubMonitor.convert(pm, 2);
IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
InputStream is = new ByteArrayInputStream(source.getBytes()); InputStream is = new ByteArrayInputStream(source.getBytes());
file.create(is, false, new SubProgressMonitor(pm, 1)); file.create(is, false, subMonitor.split(1));
if (encoding != null) { if (encoding != null) {
file.setCharset(encoding, new SubProgressMonitor(pm, 1)); file.setCharset(encoding, subMonitor.split(1));
} }
return new DeleteFileChange(file.getFullPath()); return new DeleteFileChange(file.getFullPath());
} }

13
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
View file

@ -37,7 +37,7 @@ import org.eclipse.core.runtime.CoreException;
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.OperationCanceledException; import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.ltk.core.refactoring.Change; import org.eclipse.ltk.core.refactoring.Change;
import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus; import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@ -209,7 +209,8 @@ public abstract class CRenameProcessorDelegate {
public RefactoringStatus checkFinalConditions(IProgressMonitor monitor, CheckConditionsContext context) public RefactoringStatus checkFinalConditions(IProgressMonitor monitor, CheckConditionsContext context)
throws CoreException, OperationCanceledException { throws CoreException, OperationCanceledException {
RefactoringStatus result = new RefactoringStatus(); RefactoringStatus result = new RefactoringStatus();
monitor.beginTask(RenameMessages.CRenameProcessorDelegate_task_checkFinalCondition, 2); SubMonitor subMonitor = SubMonitor.convert(monitor,
RenameMessages.CRenameProcessorDelegate_task_checkFinalCondition, 2);
IFile file = getArgument().getSourceFile(); IFile file = getArgument().getSourceFile();
//assert file != null; //assert file != null;
@ -224,16 +225,13 @@ public abstract class CRenameProcessorDelegate {
} }
IStatus stat = txtSearch.searchWord(filesToSearch.toArray(new IFile[filesToSearch.size()]), getSearchScope(), IStatus stat = txtSearch.searchWord(filesToSearch.toArray(new IFile[filesToSearch.size()]), getSearchScope(),
file, getSelectedWorkingSet(), getManager().getCCppPatterns(), getArgument().getName(), file, getSelectedWorkingSet(), getManager().getCCppPatterns(), getArgument().getName(),
new SubProgressMonitor(monitor, 1), fMatches); subMonitor.split(1), fMatches);
if (monitor.isCanceled()) {
throw new OperationCanceledException();
}
result.merge(RefactoringStatus.create(stat)); result.merge(RefactoringStatus.create(stat));
if (result.hasFatalError()) { if (result.hasFatalError()) {
return result; return result;
} }
selectMatchesByLocation(fMatches); selectMatchesByLocation(fMatches);
analyzeTextMatches(renameBindings, fMatches, new SubProgressMonitor(monitor, 1), result); analyzeTextMatches(renameBindings, fMatches, subMonitor.split(1), result);
if (result.hasFatalError()) { if (result.hasFatalError()) {
return result; return result;
} }
@ -291,7 +289,6 @@ public abstract class CRenameProcessorDelegate {
fRenameModifications.buildDelta(deltaFactory); fRenameModifications.buildDelta(deltaFactory);
fRenameModifications.buildValidateEdits(editChecker); fRenameModifications.buildValidateEdits(editChecker);
} }
monitor.done();
return result; return result;
} }