From e68e933a2e675bd7c39abddd1101599651dc7b81 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 11 Nov 2015 10:40:05 -0800 Subject: [PATCH] Removed use of deprecated SubProgressMonitor . Change-Id: I3d89d91f392ec914c69de086b2184ff3eef482ec --- .../eclipse/cdt/internal/core/index/CIndex.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java index c3cbbbd6050..25138d99f24 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java @@ -51,7 +51,7 @@ import org.eclipse.cdt.internal.core.index.composite.cpp.CPPCompositesFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; public class CIndex implements IIndex { /** @@ -454,14 +454,15 @@ public class CIndex implements IIndex { } List result = new ArrayList<>(); ILinkage[] linkages = Linkage.getIndexerLinkages(); - monitor.beginTask(Messages.CIndex_FindBindingsTask_label, fFragments.length * linkages.length); + SubMonitor loopMonitor = + SubMonitor.convert(monitor, Messages.CIndex_FindBindingsTask_label, fFragments.length * linkages.length); for (ILinkage linkage : linkages) { if (filter.acceptLinkage(linkage)) { IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fFragments.length][]; for (int i = 0; i < fFragments.length; i++) { try { IBinding[] part = fFragments[i].findBindings(names, - retargetFilter(linkage, filter), new SubProgressMonitor(monitor, 1)); + retargetFilter(linkage, filter), loopMonitor.newChild(1)); fragmentBindings[i] = new IIndexFragmentBinding[part.length]; System.arraycopy(part, 0, fragmentBindings[i], 0, part.length); } catch (CoreException e) { @@ -685,12 +686,13 @@ public class CIndex implements IIndex { } List result = new ArrayList<>(); HashSet handledIFLs= new HashSet<>(); - monitor.beginTask(Messages.CIndex_FindBindingsTask_label, fFragments.length); + SubMonitor loopMonitor = + SubMonitor.convert(monitor, Messages.CIndex_FindBindingsTask_label, fFragments.length); for (IIndexFragment fragment : fFragments) { HashSet allowedFiles= new HashSet<>(); try { - IIndexMacro[] macros= fragment.findMacros(name, isPrefix, caseSensitive, filter, - new SubProgressMonitor(monitor, 1)); + IIndexMacro[] macros= + fragment.findMacros(name, isPrefix, caseSensitive, filter, loopMonitor.newChild(1)); for (IIndexMacro indexMacro : macros) { IIndexFile file= indexMacro.getFile(); if (!allowedFiles.contains(file)) {