mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 02:06:01 +02:00
Code Issues Wiki Activity

[releng] Apply auto-clean of save to all files with Eclipse 4.23

Browse source 
This mostly is using diamond operator, but includes
adding missing @Override and organizing imports and
applying formatting improvements in the JDT formatter.

Change-Id: Id91cbff33b0a039cc5121945ffbc407ecba45866
This commit is contained in:
Jonah Graham 2022-04-17 15:34:43 -04:00
parent 148ae40d0f
commit a1c02e2cce
242 changed files with 518 additions and 452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/LocationAdapter.java
View file

@ -36,7 +36,7 @@ abstract class LocationAdapter<T> {
public abstract T getLocation(IFile file);
public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
public static final LocationAdapter<IPath> PATH = new LocationAdapter<>() {
@Override
public String extractName(IPath location) {
String name = location.lastSegment();
@ -68,7 +68,7 @@ abstract class LocationAdapter<T> {
}
};
public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
public static final LocationAdapter<URI> URI = new LocationAdapter<>() {
@Override
public String extractName(URI location) {
String path = location.getPath();

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java
View file

@ -78,7 +78,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
protected IEditorPart fEditor;
protected IWorkingCopyManager fManager;
private Comparator<IDirective> directivesComparator = new Comparator<IDirective>() {
private Comparator<IDirective> directivesComparator = new Comparator<>() {
@Override
public int compare(IDirective o1, IDirective o2) {
return o1.toString().compareToIgnoreCase(o2.toString());

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/MakeContentProvider.java
View file

@ -422,7 +422,7 @@ public class MakeContentProvider implements ITreeContentProvider, IMakeTargetLis
/**
* Check if the resource is in the list of source entries.
*
* @param rc - resource to check.
* @return {@code true} if the resource is a source folder, {@code false} otherwise.
*

2
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
View file

@ -223,7 +223,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
@Override
protected List<String> parseOptions(final String line) {
return new ArrayList<String>() {
return new ArrayList<>() {
{
add(line);
}

6
cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
View file

@ -31,9 +31,6 @@ import org.eclipse.cdt.cmake.core.properties.CMakeGenerator;
import org.eclipse.cdt.cmake.core.properties.ICMakeProperties;
import org.eclipse.cdt.cmake.core.properties.ICMakePropertiesController;
import org.eclipse.cdt.cmake.core.properties.IOsOverrides;
import org.eclipse.cdt.jsoncdb.core.CompileCommandsJsonParser;
import org.eclipse.cdt.jsoncdb.core.ISourceFileInfoConsumer;
import org.eclipse.cdt.jsoncdb.core.ParseRequest;
import org.eclipse.cdt.core.CommandLauncherManager;
import org.eclipse.cdt.core.ConsoleOutputStream;
import org.eclipse.cdt.core.ErrorParserManager;
@ -50,6 +47,9 @@ import org.eclipse.cdt.core.model.ICModelMarker;
import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.resources.IConsole;
import org.eclipse.cdt.jsoncdb.core.CompileCommandsJsonParser;
import org.eclipse.cdt.jsoncdb.core.ISourceFileInfoConsumer;
import org.eclipse.cdt.jsoncdb.core.ParseRequest;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMSearchTest.java
View file

@ -48,7 +48,7 @@ import junit.framework.Test;
* @author Vivian Kong
*/
public class PDOMSearchTest extends PDOMTestBase {
final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<>() {
@Override
public int compare(IBinding b1, IBinding b2) {
return b1.getName().compareTo(b2.getName());

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/ReferencedProjectsLanguageSettingsProvider.java
View file

@ -34,7 +34,7 @@ public class ReferencedProjectsLanguageSettingsProvider extends LanguageSettings
/** ID of the provider used in extension point from plugin.xml */
public static final String ID = "org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"; //$NON-NLS-1$
final private ThreadLocal<Boolean> recursiveCallIndicator = new ThreadLocal<Boolean>() {
final private ThreadLocal<Boolean> recursiveCallIndicator = new ThreadLocal<>() {
@Override
protected Boolean initialValue() {
return false;

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java
View file

@ -70,7 +70,7 @@ public abstract class AbstractCProjectDescriptionStorage {
protected volatile IProject project;
/** Flag used to detect if setProjectDescription(...) is called by the thread already in a setProjectDescription(...) */
final private ThreadLocal<Boolean> setProjectDescriptionOperationRunning = new ThreadLocal<Boolean>() {
final private ThreadLocal<Boolean> setProjectDescriptionOperationRunning = new ThreadLocal<>() {
@Override
protected Boolean initialValue() {
return false;

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
View file

@ -822,7 +822,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
}
/** ThreadLocal flag to let CDescriptor know whether already in a setProjectDescription */
ThreadLocal<Boolean> settingProjectDescription = new ThreadLocal<Boolean>() {
ThreadLocal<Boolean> settingProjectDescription = new ThreadLocal<>() {
@Override
protected Boolean initialValue() {
return false;

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
View file

@ -89,7 +89,7 @@ public class ASTTypeUtil {
// sizes of type strings from getting out of control for certain code patterns.
private static final int TYPE_STRING_LENGTH_THRESHOLD = 100000;
private static final ThreadLocal<Set<IBinding>> fSourceFileOnlyCheckInProgress = new ThreadLocal<Set<IBinding>>() {
private static final ThreadLocal<Set<IBinding>> fSourceFileOnlyCheckInProgress = new ThreadLocal<>() {
@Override
protected Set<IBinding> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayObjectMap.java
View file

@ -33,7 +33,7 @@ public class CharArrayObjectMap<T> extends CharTable {
/**
* An empty immutable {@code CharArrayObjectMap}.
*/
public static final CharArrayObjectMap<?> EMPTY_MAP = new CharArrayObjectMap<Object>(0) {
public static final CharArrayObjectMap<?> EMPTY_MAP = new CharArrayObjectMap<>(0) {
@Override
public Object clone() {
return this;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
View file

@ -41,7 +41,7 @@ public final class CollectionUtils {
* @throws NullPointerException if list is {@code null}
*/
public static <T> Iterator<T> reverseIterator(final List<T> list) {
return new Iterator<T>() {
return new Iterator<>() {
ListIterator<T> iterator = list.listIterator(list.size());
@Override
@ -93,7 +93,7 @@ public final class CollectionUtils {
if (iter == null)
throw new NullPointerException("iter parameter is null"); //$NON-NLS-1$
return new Iterable<T>() {
return new Iterable<>() {
@Override
public Iterator<T> iterator() {
return iter;

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
View file

@ -174,7 +174,7 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
*/
@Override
public Iterator<T> iterator() {
return new Iterator<T>() {
return new Iterator<>() {
int nextIndex;
@Override

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
View file

@ -95,13 +95,13 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat
private IBuiltinBindingsProvider fBuiltinBindingsProvider;
// Caches
private final ThreadLocal<WeakHashMap<IType, String>> fUnnormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() {
private final ThreadLocal<WeakHashMap<IType, String>> fUnnormalizedTypeStringCache = new ThreadLocal<>() {
@Override
protected WeakHashMap<IType, String> initialValue() {
return new WeakHashMap<>();
}
};
private final ThreadLocal<WeakHashMap<IType, String>> fNormalizedTypeStringCache = new ThreadLocal<WeakHashMap<IType, String>>() {
private final ThreadLocal<WeakHashMap<IType, String>> fNormalizedTypeStringCache = new ThreadLocal<>() {
@Override
protected WeakHashMap<IType, String> initialValue() {
return new WeakHashMap<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/CompositeValue.java
View file

@ -160,7 +160,7 @@ public final class CompositeValue implements IValue {
// The set of class types for which composite value creation is in progress on each thread.
// Used to guard against infinite recursion due to a class (illegally) aggregating itself.
private static final ThreadLocal<Set<ICPPClassType>> fCreateInProgress = new ThreadLocal<Set<ICPPClassType>>() {
private static final ThreadLocal<Set<ICPPClassType>> fCreateInProgress = new ThreadLocal<>() {
@Override
protected Set<ICPPClassType> initialValue() {
return new TreeSet<>((type1, type2) -> {

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
View file

@ -51,7 +51,7 @@ public class CVariable extends PlatformObject implements ICInternalBinding, IVar
* The set of CVariable objects for which initial value computation is in progress on each thread.
* This is used to guard against recursion during initial value computation.
*/
private static final ThreadLocal<Set<CVariable>> fInitialValueInProgress = new ThreadLocal<Set<CVariable>>() {
private static final ThreadLocal<Set<CVariable>> fInitialValueInProgress = new ThreadLocal<>() {
@Override
protected Set<CVariable> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
View file

@ -54,7 +54,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
// The following fields are used by the PDOM bindings and need to be volatile.
private volatile ICPPBase[] fBases;
private volatile ICPPMethod[] ownInheritedConstructors;
private final ThreadLocal<Boolean> fComputingBases = new ThreadLocal<Boolean>() {
private final ThreadLocal<Boolean> fComputingBases = new ThreadLocal<>() {
@Override
protected Boolean initialValue() {
return false;

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
View file

@ -190,7 +190,7 @@ public class CPPClassSpecialization extends CPPSpecialization
private ICPPClassSpecializationScope specScope;
private ObjectMap specializationMap = ObjectMap.EMPTY_MAP;
private ICPPBase[] bases;
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
@Override
protected Set<IBinding> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
View file

@ -69,7 +69,7 @@ public class CPPVariable extends PlatformObject implements ICPPInternalDeclaredV
* The set of CPPVariable objects for which initial value computation is in progress on each thread.
* This is used to guard against recursion during initial value computation.
*/
private static final ThreadLocal<Set<CPPVariable>> fInitialValueInProgress = new ThreadLocal<Set<CPPVariable>>() {
private static final ThreadLocal<Set<CPPVariable>> fInitialValueInProgress = new ThreadLocal<>() {
@Override
protected Set<CPPVariable> initialValue() {
return new HashSet<>();

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
View file

@ -299,14 +299,14 @@ public class CPPSemantics {
// that are not reachable via includes from the file containing the name.
// Generally this is not allowed, but certain consumers, such as IncludeOrganizer,
// need it (since the whole point of IncludeOrganizer is to find missing headers).
private static final ThreadLocal<Boolean> fAllowPromiscuousBindingResolution = new ThreadLocal<Boolean>() {
private static final ThreadLocal<Boolean> fAllowPromiscuousBindingResolution = new ThreadLocal<>() {
@Override
protected Boolean initialValue() {
return false;
}
};
private static final ThreadLocal<Deque<IASTNode>> fLookupPoints = new ThreadLocal<Deque<IASTNode>>() {
private static final ThreadLocal<Deque<IASTNode>> fLookupPoints = new ThreadLocal<>() {
@Override
protected Deque<IASTNode> initialValue() {
return new ArrayDeque<>();

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
View file

@ -239,13 +239,13 @@ public class CPPTemplates {
// Infrastructure to protect against rogue template metaprograms that don't terminate.
private static final int TEMPLATE_INSTANTIATION_DEPTH_LIMIT = 128;
private static final ThreadLocal<Integer> fTemplateInstantiationDepth = new ThreadLocal<Integer>() {
private static final ThreadLocal<Integer> fTemplateInstantiationDepth = new ThreadLocal<>() {
@Override
protected Integer initialValue() {
return 0;
}
};
private static final ThreadLocal<Set<TypeInstantiationRequest>> instantiationsInProgress = new ThreadLocal<Set<TypeInstantiationRequest>>() {
private static final ThreadLocal<Set<TypeInstantiationRequest>> instantiationsInProgress = new ThreadLocal<>() {
@Override
protected Set<TypeInstantiationRequest> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
View file

@ -279,7 +279,7 @@ public class CPPVisitor extends ASTQueries {
// Thread-local set of declarators for which auto types are being created.
// Used to prevent infinite recursion while processing invalid self-referencing
// auto-type declarations.
private static final ThreadLocal<Set<IASTDeclarator>> autoTypeDeclarators = new ThreadLocal<Set<IASTDeclarator>>() {
private static final ThreadLocal<Set<IASTDeclarator>> autoTypeDeclarators = new ThreadLocal<>() {
@Override
protected Set<IASTDeclarator> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalUtil.java
View file

@ -39,7 +39,7 @@ public class EvalUtil {
* The set of ICPPVariable objects for which initial value computation is in progress on each thread.
* This is used to guard against recursion during initial value computation.
*/
private static final ThreadLocal<Set<ICPPVariable>> fInitialValueInProgress = new ThreadLocal<Set<ICPPVariable>>() {
private static final ThreadLocal<Set<ICPPVariable>> fInitialValueInProgress = new ThreadLocal<>() {
@Override
protected Set<ICPPVariable> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
View file

@ -45,7 +45,7 @@ import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
public class CompositeCPPClassSpecialization extends CompositeCPPClassType implements ICPPClassSpecialization {
private ObjectMap specializationMap;
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
@Override
protected Set<IBinding> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/SignificantMacros.java
View file

@ -33,7 +33,7 @@ import org.eclipse.cdt.core.parser.util.CharArrayUtils;
public class SignificantMacros implements ISignificantMacros {
public static final char[] DEFINED = { 0 };
public static final char[] UNDEFINED = { 1 };
private static final Comparator<char[]> SORTER = new Comparator<char[]>() {
private static final Comparator<char[]> SORTER = new Comparator<>() {
@Override
public int compare(char[] s1, char[] s2) {
return CharArrayUtils.compare(s1, s2);

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
View file

@ -137,7 +137,7 @@ public class Profiler {
Profiler profiler = threadProfiler.get();
if (profiler != null) {
List<Map.Entry<String, Timer>> list = new ArrayList<>(profiler.timers.entrySet());
Comparator<Map.Entry<String, Timer>> c = new Comparator<Map.Entry<String, Timer>>() {
Comparator<Map.Entry<String, Timer>> c = new Comparator<>() {
@Override
public int compare(Entry<String, Timer> o1, Entry<String, Timer> o2) {
long diff = o2.getValue().getElapsedTime() - o1.getValue().getElapsedTime();
@ -153,7 +153,7 @@ public class Profiler {
if (!profiler.counters.isEmpty()) {
List<Map.Entry<String, int[]>> keyList = new ArrayList<>(profiler.counters.entrySet());
Comparator<Map.Entry<String, int[]>> c2 = new Comparator<Map.Entry<String, int[]>>() {
Comparator<Map.Entry<String, int[]>> c2 = new Comparator<>() {
@Override
public int compare(Entry<String, int[]> o1, Entry<String, int[]> o2) {
return o2.getValue()[0] - o1.getValue()[0];

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/CModelListener.java
View file

@ -42,7 +42,7 @@ public class CModelListener implements IElementChangedListener, IResourceChangeL
public static boolean sSuppressUpdateOfLastRecentlyUsed = false;
private PDOMManager fManager;
private final LinkedHashMap<ITranslationUnit, ITranslationUnit> fLRUs = new LinkedHashMap<ITranslationUnit, ITranslationUnit>(
private final LinkedHashMap<ITranslationUnit, ITranslationUnit> fLRUs = new LinkedHashMap<>(
UPDATE_LR_CHANGED_FILES_COUNT, 0.75f, true) {
@Override
protected boolean removeEldestEntry(Map.Entry<ITranslationUnit, ITranslationUnit> eldest) {

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
View file

@ -87,7 +87,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
* The set of types currently being loaded from the index on each thread, represented as record numbers.
* This is used to guard against infinite recursion while loading types.
*/
private static final ThreadLocal<Set<Long>> fLoadTypeInProgress = new ThreadLocal<Set<Long>>() {
private static final ThreadLocal<Set<Long>> fLoadTypeInProgress = new ThreadLocal<>() {
@Override
protected Set<Long> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
View file

@ -76,7 +76,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization
private volatile ICPPClassScope fScope;
private ObjectMap specializationMap; // Obtained from the synchronized PDOM cache.
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<Set<IBinding>>() {
private final ThreadLocal<Set<IBinding>> fInProgress = new ThreadLocal<>() {
@Override
protected Set<IBinding> initialValue() {
return new HashSet<>();

2
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
View file

@ -18,10 +18,10 @@ import org.eclipse.cdt.core.cdtvariables.CdtVariable;
import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
/**

4
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/resources/LocationAdapter.java
View file

@ -35,7 +35,7 @@ abstract class LocationAdapter<T> {
public abstract T getLocation(IFile file);
public static final LocationAdapter<IPath> PATH = new LocationAdapter<IPath>() {
public static final LocationAdapter<IPath> PATH = new LocationAdapter<>() {
@Override
public String extractName(IPath location) {
String name = location.lastSegment();
@ -61,7 +61,7 @@ abstract class LocationAdapter<T> {
}
};
public static final LocationAdapter<URI> URI = new LocationAdapter<URI>() {
public static final LocationAdapter<URI> URI = new LocationAdapter<>() {
@Override
public String extractName(URI location) {
String path = location.getPath();

2
core/org.eclipse.cdt.core/templateengine/org/eclipse/cdt/core/templateengine/TemplateCore.java
View file

@ -46,7 +46,7 @@ public class TemplateCore {
private static Map<TemplateInfo, TemplateCore> templateCache = new HashMap<>();
public static final Comparator<TemplateCore> TEMPLATE_ID_CASE_INSENSITIVE_COMPARATOR = new Comparator<TemplateCore>() {
public static final Comparator<TemplateCore> TEMPLATE_ID_CASE_INSENSITIVE_COMPARATOR = new Comparator<>() {
@Override
public int compare(TemplateCore t1, TemplateCore t2) {
return String.CASE_INSENSITIVE_ORDER.compare(t1.getTemplateId(), t2.getTemplateId());

2
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/reducer/RemoveUnusedDeclarationsRefactoring.java
View file

@ -563,7 +563,7 @@ public class RemoveUnusedDeclarationsRefactoring extends CRefactoring {
* in the reverse order.
*/
private static class SortedNodeSet<T extends IASTNode> extends TreeSet<T> {
private static final Comparator<IASTNode> COMPARATOR = new Comparator<IASTNode>() {
private static final Comparator<IASTNode> COMPARATOR = new Comparator<>() {
@Override
public int compare(IASTNode node1, IASTNode node2) {
int c = Integer.compare(ASTNodes.offset(node1), ASTNodes.offset(node2));

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/fix/LinkedProposalModel.java
View file

@ -49,7 +49,7 @@ public class LinkedProposalModel {
public Iterator<LinkedProposalPositionGroup> getPositionGroupIterator() {
if (fPositionGroups == null) {
return new Iterator<LinkedProposalPositionGroup>() {
return new Iterator<>() {
@Override
public boolean hasNext() {
return false;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java
View file

@ -131,7 +131,7 @@ public class CreateParserLogAction implements IObjectActionDelegate {
}
}
private static final Comparator<String> COMP_INSENSITIVE = new Comparator<String>() {
private static final Comparator<String> COMP_INSENSITIVE = new Comparator<>() {
@Override
public int compare(String o1, String o2) {
return o1.toUpperCase().compareTo(o2.toUpperCase());

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java
View file

@ -51,7 +51,7 @@ public class CHHistoryListAction extends Action {
setTitle(CHMessages.CHHistoryListAction_HistoryDialog_title);
String[] buttonLabels = new String[] { CHMessages.CHHistoryListAction_Remove_label, };
IListAdapter<ICElement> adapter = new IListAdapter<ICElement>() {
IListAdapter<ICElement> adapter = new IListAdapter<>() {
@Override
public void customButtonPressed(ListDialogField<ICElement> field, int index) {
doCustomButtonPressed();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHReferenceInfo.java
View file

@ -16,7 +16,7 @@ package org.eclipse.cdt.internal.ui.callhierarchy;
import java.util.Comparator;
public class CHReferenceInfo {
public static final Comparator<CHReferenceInfo> COMPARE_OFFSET = new Comparator<CHReferenceInfo>() {
public static final Comparator<CHReferenceInfo> COMPARE_OFFSET = new Comparator<>() {
@Override
public int compare(CHReferenceInfo r1, CHReferenceInfo r2) {
return r1.fOffset - r2.fOffset;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
View file

@ -171,7 +171,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage
super(CPathEntryMessages.IncludeSymbolEntryPage_title);
fContext = context;
IncludeSymbolAdapter adapter = new IncludeSymbolAdapter();
fIncludeSymPathsList = new TreeListDialogField<CPElementGroup>(adapter, buttonLabel,
fIncludeSymPathsList = new TreeListDialogField<>(adapter, buttonLabel,
new CPElementLabelProvider(true, false)) {
@Override

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
View file

@ -218,7 +218,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB
super(CPathEntryMessages.IncludeSymbolEntryPage_title);
fContext = context;
IncludeSymbolAdapter adapter = new IncludeSymbolAdapter();
fIncludeSymPathsList = new TreeListDialogField<CPElementGroup>(adapter, buttonLabel,
fIncludeSymPathsList = new TreeListDialogField<>(adapter, buttonLabel,
new CPElementLabelProvider(true, false)) {
@Override

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryListAction.java
View file

@ -52,7 +52,7 @@ public class IBHistoryListAction extends Action {
setTitle(IBMessages.IBHistoryListAction_HistoryDialog_title);
String[] buttonLabels = new String[] { IBMessages.IBHistoryListAction_Remove_label, };
IListAdapter<ITranslationUnit> adapter = new IListAdapter<ITranslationUnit>() {
IListAdapter<ITranslationUnit> adapter = new IListAdapter<>() {
@Override
public void customButtonPressed(ListDialogField<ITranslationUnit> field, int index) {
doCustomButtonPressed();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
View file

@ -158,7 +158,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
}
}
private final Comparator<ModelElement> fCategoryComparator = new Comparator<ModelElement>() {
private final Comparator<ModelElement> fCategoryComparator = new Comparator<>() {
@Override
public int compare(ModelElement o1, ModelElement o2) {
return o1.getRank() - o2.getRank();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/HeaderSubstitutionMapEditDialog.java
View file

@ -80,7 +80,7 @@ public class HeaderSubstitutionMapEditDialog extends ResizableStatusDialog {
private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
private static final String TAG_HEADER_SUBSTITUTION_MAP = "header_substitution_map"; //$NON-NLS-1$
private static final Collator COLLATOR = Collator.getInstance();
private static final Comparator<HeaderSubstitutionRule> SOURCE_COMPARATOR = new Comparator<HeaderSubstitutionRule>() {
private static final Comparator<HeaderSubstitutionRule> SOURCE_COMPARATOR = new Comparator<>() {
@Override
public int compare(HeaderSubstitutionRule r1, HeaderSubstitutionRule r2) {
return COLLATOR.compare(r1.getSource(), r2.getSource());

41
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
View file

@ -160,24 +160,22 @@ public class NameStyleBlock extends OptionsConfigurationBlock {
Category codeCategory = new Category(PreferencesMessages.NameStyleBlock_code_node);
new Category(PreferencesMessages.NameStyleBlock_constant_node,
PreferencesMessages.NameStyleBlock_constant_node_description, EXAMPLE_CONSTANT_NAME, codeCategory)
.setCapitalizationKey(KEY_CONSTANT_CAPITALIZATION)
.setWordDelimiterKey(KEY_CONSTANT_WORD_DELIMITER).setPrefixKey(KEY_CONSTANT_PREFIX)
.setSuffixKey(KEY_CONSTANT_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
.setCapitalizationKey(KEY_CONSTANT_CAPITALIZATION).setWordDelimiterKey(KEY_CONSTANT_WORD_DELIMITER)
.setPrefixKey(KEY_CONSTANT_PREFIX).setSuffixKey(KEY_CONSTANT_SUFFIX)
.setNameValidator(IDENTIFIER_VALIDATOR);
new Category(PreferencesMessages.NameStyleBlock_variable_node,
PreferencesMessages.NameStyleBlock_variable_node_description, EXAMPLE_VARIABLE_NAME, codeCategory)
.setCapitalizationKey(KEY_VARIABLE_CAPITALIZATION)
.setWordDelimiterKey(KEY_VARIABLE_WORD_DELIMITER).setPrefixKey(KEY_VARIABLE_PREFIX)
.setSuffixKey(KEY_VARIABLE_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
.setCapitalizationKey(KEY_VARIABLE_CAPITALIZATION).setWordDelimiterKey(KEY_VARIABLE_WORD_DELIMITER)
.setPrefixKey(KEY_VARIABLE_PREFIX).setSuffixKey(KEY_VARIABLE_SUFFIX)
.setNameValidator(IDENTIFIER_VALIDATOR);
Category fieldCategory = new Category(PreferencesMessages.NameStyleBlock_field_node,
PreferencesMessages.NameStyleBlock_field_node_description, EXAMPLE_FIELD_NAME, codeCategory)
.setCapitalizationKey(KEY_FIELD_CAPITALIZATION).setWordDelimiterKey(KEY_FIELD_WORD_DELIMITER)
.setPrefixKey(KEY_FIELD_PREFIX).setSuffixKey(KEY_FIELD_SUFFIX)
.setNameValidator(IDENTIFIER_VALIDATOR);
.setPrefixKey(KEY_FIELD_PREFIX).setSuffixKey(KEY_FIELD_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
new Category(PreferencesMessages.NameStyleBlock_method_node,
PreferencesMessages.NameStyleBlock_method_node_description, EXAMPLE_METHOD_NAME, codeCategory)
.setCapitalizationKey(KEY_METHOD_CAPITALIZATION).setWordDelimiterKey(KEY_METHOD_WORD_DELIMITER)
.setPrefixKey(KEY_METHOD_PREFIX).setSuffixKey(KEY_METHOD_SUFFIX)
.setNameValidator(IDENTIFIER_VALIDATOR);
.setPrefixKey(KEY_METHOD_PREFIX).setSuffixKey(KEY_METHOD_SUFFIX).setNameValidator(IDENTIFIER_VALIDATOR);
new Category(PreferencesMessages.NameStyleBlock_getter_node,
PreferencesMessages.NameStyleBlock_getter_node_description, EXAMPLE_FIELD_NAME, codeCategory)
.setCapitalizationKey(KEY_GETTER_CAPITALIZATION).setWordDelimiterKey(KEY_GETTER_WORD_DELIMITER)
@ -187,26 +185,25 @@ public class NameStyleBlock extends OptionsConfigurationBlock {
new Category(PreferencesMessages.NameStyleBlock_setter_node,
PreferencesMessages.NameStyleBlock_setter_node_description, EXAMPLE_FIELD_NAME, codeCategory)
.setCapitalizationKey(KEY_SETTER_CAPITALIZATION).setWordDelimiterKey(KEY_SETTER_WORD_DELIMITER)
.setPrefixKey(KEY_SETTER_PREFIX).setSuffixKey(KEY_SETTER_SUFFIX)
.setSeedNameGenerator(fieldCategory).setNameValidator(IDENTIFIER_VALIDATOR)
.setTrimFieldName(true);
.setPrefixKey(KEY_SETTER_PREFIX).setSuffixKey(KEY_SETTER_SUFFIX).setSeedNameGenerator(fieldCategory)
.setNameValidator(IDENTIFIER_VALIDATOR).setTrimFieldName(true);
new IncludeGuardCategory(codeCategory);
Category fileCategory = new Category(PreferencesMessages.NameStyleBlock_files_node);
new Category(PreferencesMessages.NameStyleBlock_cpp_header_node,
PreferencesMessages.NameStyleBlock_cpp_header_node_description, EXAMPLE_CLASS_NAME, fileCategory)
.setCapitalizationKey(KEY_CPP_HEADER_CAPITALIZATION)
.setWordDelimiterKey(KEY_CPP_HEADER_WORD_DELIMITER).setPrefixKey(KEY_CPP_HEADER_PREFIX)
.setSuffixKey(KEY_CPP_HEADER_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
.setCapitalizationKey(KEY_CPP_HEADER_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_HEADER_WORD_DELIMITER)
.setPrefixKey(KEY_CPP_HEADER_PREFIX).setSuffixKey(KEY_CPP_HEADER_SUFFIX)
.setNameValidator(FILENAME_VALIDATOR);
new Category(PreferencesMessages.NameStyleBlock_cpp_source_node,
PreferencesMessages.NameStyleBlock_cpp_source_node_description, EXAMPLE_CLASS_NAME, fileCategory)
.setCapitalizationKey(KEY_CPP_SOURCE_CAPITALIZATION)
.setWordDelimiterKey(KEY_CPP_SOURCE_WORD_DELIMITER).setPrefixKey(KEY_CPP_SOURCE_PREFIX)
.setSuffixKey(KEY_CPP_SOURCE_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
.setCapitalizationKey(KEY_CPP_SOURCE_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_SOURCE_WORD_DELIMITER)
.setPrefixKey(KEY_CPP_SOURCE_PREFIX).setSuffixKey(KEY_CPP_SOURCE_SUFFIX)
.setNameValidator(FILENAME_VALIDATOR);
new Category(PreferencesMessages.NameStyleBlock_cpp_test_node,
PreferencesMessages.NameStyleBlock_cpp_test_node_description, EXAMPLE_CLASS_NAME, fileCategory)
.setCapitalizationKey(KEY_CPP_TEST_CAPITALIZATION)
.setWordDelimiterKey(KEY_CPP_TEST_WORD_DELIMITER).setPrefixKey(KEY_CPP_TEST_PREFIX)
.setSuffixKey(KEY_CPP_TEST_SUFFIX).setNameValidator(FILENAME_VALIDATOR);
.setCapitalizationKey(KEY_CPP_TEST_CAPITALIZATION).setWordDelimiterKey(KEY_CPP_TEST_WORD_DELIMITER)
.setPrefixKey(KEY_CPP_TEST_PREFIX).setSuffixKey(KEY_CPP_TEST_SUFFIX)
.setNameValidator(FILENAME_VALIDATOR);
return new Category[] { codeCategory, fileCategory };
}

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRefactoringMatchStore.java
View file

@ -34,7 +34,7 @@ public class CRefactoringMatchStore {
private Comparator<CRefactoringMatch> fOffsetComparator;
public CRefactoringMatchStore() {
fOffsetComparator = new Comparator<CRefactoringMatch>() {
fOffsetComparator = new Comparator<>() {
@Override
public int compare(CRefactoringMatch o1, CRefactoringMatch o2) {
return o1.getOffset() - o2.getOffset();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
View file

@ -310,7 +310,7 @@ public class TextSearchWrapper {
}
}
final static Comparator<int[]> COMPARE_FIRST_INTEGER = new Comparator<int[]>() {
final static Comparator<int[]> COMPARE_FIRST_INTEGER = new Comparator<>() {
@Override
public int compare(int[] o1, int[] o2) {
return (o1)[0] - (o2)[0];

24
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java
View file

@ -74,7 +74,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
// may need a corresponding adjustment, and this stores the adjusted offset.
private int fAdjustedParseOffset = -1;
private Lazy<Integer> fContextInfoPosition = new Lazy<Integer>() {
private Lazy<Integer> fContextInfoPosition = new Lazy<>() {
@Override
protected Integer calculateValue() {
return guessContextInformationPosition();
@ -83,7 +83,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
private final Lazy<ITranslationUnit> fTU;
private final Lazy<Integer> fParseOffset = new Lazy<Integer>() {
private final Lazy<Integer> fParseOffset = new Lazy<>() {
@Override
protected Integer calculateValue() {
int result = doCalculate();
@ -196,7 +196,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
return null;
}
private final Lazy<IASTCompletionNode> fCN = new Lazy<IASTCompletionNode>() {
private final Lazy<IASTCompletionNode> fCN = new Lazy<>() {
@Override
protected IASTCompletionNode calculateValue() {
int offset = getParseOffset();
@ -253,7 +253,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<Boolean> afterOpeningAngleBracket = new Lazy<Boolean>() {
private final Lazy<Boolean> afterOpeningAngleBracket = new Lazy<>() {
@Override
protected Boolean calculateValue() {
final int parseOffset = getParseOffset();
@ -264,7 +264,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<Boolean> afterOpeningParenthesisOrBrace = new Lazy<Boolean>() {
private final Lazy<Boolean> afterOpeningParenthesisOrBrace = new Lazy<>() {
@Override
protected Boolean calculateValue() {
final int invocationOffset = getInvocationOffset();
@ -295,7 +295,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<Boolean> inUsingDeclaration = new Lazy<Boolean>() {
private final Lazy<Boolean> inUsingDeclaration = new Lazy<>() {
/**
* Checks whether the invocation offset is inside a using-declaration.
*
@ -331,7 +331,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<Boolean> followedBySemicolon = new Lazy<Boolean>() {
private final Lazy<Boolean> followedBySemicolon = new Lazy<>() {
@Override
protected Boolean calculateValue() {
final IDocument doc = getDocument();
@ -342,7 +342,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<Boolean> followedByOpeningParen = new Lazy<Boolean>() {
private final Lazy<Boolean> followedByOpeningParen = new Lazy<>() {
@Override
protected Boolean calculateValue() {
final IDocument doc = getDocument();
@ -353,7 +353,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<String> functionParameterDelimiter = new Lazy<String>() {
private final Lazy<String> functionParameterDelimiter = new Lazy<>() {
@Override
protected String calculateValue() {
String propertyKey = DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_METHOD_DECLARATION_PARAMETERS;
@ -362,7 +362,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
}
};
private final Lazy<String> templateParameterDelimiter = new Lazy<String>() {
private final Lazy<String> templateParameterDelimiter = new Lazy<>() {
@Override
protected String calculateValue() {
String propertyKey = DefaultCodeFormatterConstants.FORMATTER_INSERT_SPACE_AFTER_COMMA_IN_TEMPLATE_PARAMETERS;
@ -387,7 +387,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
fIsCompletion = isCompletion;
fIsContextInformationStyle = !isCompletion;
fIsAutoActivated = isAutoActivated;
fTU = new Lazy<ITranslationUnit>() {
fTU = new Lazy<>() {
@Override
protected ITranslationUnit calculateValue() {
return CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(fEditor.getEditorInput());
@ -402,7 +402,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
*/
public CContentAssistInvocationContext(final ITranslationUnit unit, boolean isCompletion) {
super();
fTU = new Lazy<ITranslationUnit>() {
fTU = new Lazy<>() {
@Override
protected ITranslationUnit calculateValue() {
return unit;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
View file

@ -92,7 +92,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor {
*/
private static final String PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY = "EmptyDefaultAssistCategory"; //$NON-NLS-1$
private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR = new Comparator<CompletionProposalCategory>() {
private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR = new Comparator<>() {
@Override
public int compare(CompletionProposalCategory d1, CompletionProposalCategory d2) {
return d1.getSortOrder() - d2.getSortOrder();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
View file

@ -51,7 +51,7 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction {
private ResourceBundle fBundle;
// Annotations at the ruler's current line of activity, keyed by their presentation layer,
// in decreasing order (i.e. top to bottom).
private static Comparator<Integer> decreasingOrder = new Comparator<Integer>() {
private static Comparator<Integer> decreasingOrder = new Comparator<>() {
@Override
public int compare(Integer a, Integer b) {
return b - a;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
View file

@ -1312,7 +1312,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
}
}
Comparator<Tuple> comparator = new Comparator<Tuple>() {
Comparator<Tuple> comparator = new Comparator<>() {
@Override
public int compare(Tuple t1, Tuple t2) {
return t1.position.getOffset() - t2.position.getOffset();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java
View file

@ -30,7 +30,7 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver;
public class TemplateVariableProcessor implements IContentAssistProcessor {
private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator = new Comparator<TemplateVariableProposal>() {
private static Comparator<TemplateVariableProposal> fgTemplateVariableProposalComparator = new Comparator<>() {
@Override
public int compare(TemplateVariableProposal arg0, TemplateVariableProposal arg1) {
return arg0.getDisplayString().compareTo(arg1.getDisplayString());

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java
View file

@ -51,7 +51,7 @@ public class THHistoryListAction extends Action {
setTitle(Messages.THHistoryListAction_HistoryList_title);
String[] buttonLabels = new String[] { Messages.THHistoryListAction_Remove, };
IListAdapter<ICElement> adapter = new IListAdapter<ICElement>() {
IListAdapter<ICElement> adapter = new IListAdapter<>() {
@Override
public void customButtonPressed(ListDialogField<ICElement> field, int index) {
doCustomButtonPressed();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/AbstractWorkingSetConfigsContribution.java
View file

@ -38,7 +38,7 @@ abstract class AbstractWorkingSetConfigsContribution extends CompoundContributio
private IWorkingSetProxy workingSet;
private Comparator<IWorkingSetConfiguration> configOrdering = new Comparator<IWorkingSetConfiguration>() {
private Comparator<IWorkingSetConfiguration> configOrdering = new Comparator<>() {
private Collator collator = Collator.getInstance();
@Override

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
View file

@ -115,7 +115,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
String[] buttonLabels = new String[] { CUIMessages.BinaryParserBlock_button_up,
CUIMessages.BinaryParserBlock_button_down };
IListAdapter<BinaryParserConfiguration> listAdapter = new IListAdapter<BinaryParserConfiguration>() {
IListAdapter<BinaryParserConfiguration> listAdapter = new IListAdapter<>() {
@Override
public void customButtonPressed(ListDialogField<BinaryParserConfiguration> field, int index) {
@ -131,8 +131,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
}
};
binaryList = new CheckedListDialogField<BinaryParserConfiguration>(listAdapter, buttonLabels,
new BinaryParserLabelProvider()) {
binaryList = new CheckedListDialogField<>(listAdapter, buttonLabels, new BinaryParserLabelProvider()) {
@Override
protected int getListStyle() {

3
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
View file

@ -971,7 +971,8 @@ public class ExecutablesManager extends PlatformObject
synchronized (executablesMap) {
for (Executable executableRemoved : executablesRemoved) {
List<Executable> execs = executablesMap.get(executableRemoved.getProject());
assert execs != null : "considering the list was used in populating 'executablesRemoved', how could it be gone now?"; //$NON-NLS-1$
assert execs != null
: "considering the list was used in populating 'executablesRemoved', how could it be gone now?"; //$NON-NLS-1$
if (execs != null) {
execs.remove(executableRemoved);
}

4
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AddWatchpointOnVariableActionDelegate.java
View file

@ -86,8 +86,8 @@ public class AddWatchpointOnVariableActionDelegate extends AddWatchpointActionDe
assert false : "action should not have been available for object " + obj; //$NON-NLS-1$
} else if (selection instanceof StructuredSelection) {
// Not sure why, but sometimes we get an extraneous empty StructuredSelection. Seems harmless enough
assert ((StructuredSelection) selection)
.getFirstElement() == null : "action installed in unexpected type of view/part"; //$NON-NLS-1$
assert ((StructuredSelection) selection).getFirstElement() == null
: "action installed in unexpected type of view/part"; //$NON-NLS-1$
} else {
assert false : "action installed in unexpected type of view/part"; //$NON-NLS-1$
}

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/internal/utils/DebugViewUtils.java
View file

@ -49,7 +49,7 @@ public class DebugViewUtils {
/** Gets workbench view (if any) with specified ID. */
public static IViewPart getViewWithID(String viewID) {
final String viewID_f = viewID;
RunnableWithResult<IViewPart> runnable = new RunnableWithResult<IViewPart>() {
RunnableWithResult<IViewPart> runnable = new RunnableWithResult<>() {
@Override
public IViewPart call() {
IViewPart view = null;

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java
View file

@ -133,7 +133,7 @@ public class GdbPinProvider implements IPinProvider {
IThreadDMData data = null;
final DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), fSession.getId());
try {
Query<IThreadDMData> query = new Query<IThreadDMData>() {
Query<IThreadDMData> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<IThreadDMData> rm) {
final IProcesses processes = tracker.getService(IProcesses.class);

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbSteppingModeTarget.java
View file

@ -46,7 +46,7 @@ public class GdbSteppingModeTarget extends DsfSteppingModeTarget {
@Override
public boolean supportsInstructionStepping() {
Query<Boolean> supportInstructionStepping = new Query<Boolean>() {
Query<Boolean> supportInstructionStepping = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
IGDBBackend backend = fTracker.getService(IGDBBackend.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbAbstractReverseStepCommand.java
View file

@ -75,7 +75,7 @@ public abstract class GdbAbstractReverseStepCommand extends AbstractDebugCommand
}
final StepType stepType = getStepType();
Query<Object> reverseStepQuery = new Query<Object>() {
Query<Object> reverseStepQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Object> rm) {
IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@ -111,7 +111,7 @@ public abstract class GdbAbstractReverseStepCommand extends AbstractDebugCommand
}
final StepType stepType = getStepType();
Query<Boolean> canReverseQuery = new Query<Boolean>() {
Query<Boolean> canReverseQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);

6
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbConnectCommand.java
View file

@ -115,7 +115,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
*/
@Override
public boolean canConnect() {
Query<Boolean> canConnectQuery = new Query<Boolean>() {
Query<Boolean> canConnectQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IProcesses procService = fTracker.getService(IProcesses.class);
@ -271,7 +271,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
@Override
protected void doExecute(Object[] targets, IProgressMonitor monitor, final IRequest request) throws CoreException {
Query<Boolean> connectQuery = new Query<Boolean>() {
Query<Boolean> connectQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Boolean> rm) {
connect(new RequestMonitor(fExecutor, rm) {
@ -521,7 +521,7 @@ public class GdbConnectCommand extends RefreshableDebugCommand implements IConne
// Prompt the user to choose one or more processes
new PromptForPidJob(LaunchUIMessages.getString("ProcessPrompter.PromptJob"), //$NON-NLS-1$
processes.toArray(new IProcessExtendedInfo[processes.size()]), debuggedProcesses,
new DataRequestMonitor<Object>(fExecutor, rm) {
new DataRequestMonitor<>(fExecutor, rm) {
@Override
protected void handleCancel() {
rm.cancel();

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbDebugNewExecutableCommand.java
View file

@ -95,7 +95,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
public boolean canDebugNewExecutable() {
Query<Boolean> canDebugQuery = new Query<Boolean>() {
Query<Boolean> canDebugQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IProcesses procService = fTracker.getService(IProcesses.class);
@ -157,7 +157,7 @@ public class GdbDebugNewExecutableCommand extends RefreshableDebugCommand implem
@Override
protected void doExecute(Object[] targets, IProgressMonitor monitor, IRequest request) throws CoreException {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbResumeWithoutSignalCommand.java
View file

@ -64,7 +64,7 @@ public class GdbResumeWithoutSignalCommand extends AbstractDebugCommand implemen
return;
}
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
public void execute(DataRequestMonitor<Object> rm) {
IRunControl runControl = fTracker.getService(IRunControl.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseResumeCommand.java
View file

@ -64,7 +64,7 @@ public class GdbReverseResumeCommand extends AbstractDebugCommand implements IRe
return;
}
Query<Object> reverseResume = new Query<Object>() {
Query<Object> reverseResume = new Query<>() {
@Override
public void execute(DataRequestMonitor<Object> rm) {
IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@ -99,7 +99,7 @@ public class GdbReverseResumeCommand extends AbstractDebugCommand implements IRe
return false;
}
Query<Boolean> canReverseResume = new Query<Boolean>() {
Query<Boolean> canReverseResume = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);

8
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java
View file

@ -118,7 +118,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
return;
}
Query<Object> setReverseMode = new Query<Object>() {
Query<Object> setReverseMode = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
final IReverseRunControl2 runControl = fTracker.getService(IReverseRunControl2.class);
@ -209,7 +209,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
return false;
}
Query<Boolean> canSetReverseMode = new Query<Boolean>() {
Query<Boolean> canSetReverseMode = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@ -273,7 +273,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
return false;
}
Query<Boolean> isToggledQuery = new Query<Boolean>() {
Query<Boolean> isToggledQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Boolean> rm) {
final IReverseRunControl runControl = fTracker.getService(IReverseRunControl.class);
@ -349,7 +349,7 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements ICh
return ReverseDebugMethod.OFF;
}
Query<ReverseDebugMethod> reverseMethodQuery = new Query<ReverseDebugMethod>() {
Query<ReverseDebugMethod> reverseMethodQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<ReverseDebugMethod> rm) {
IReverseRunControl2 runControl = fTracker.getService(IReverseRunControl2.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java
View file

@ -74,7 +74,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
PlatformUI.getWorkbench().getDisplay().syncExec(() -> fileName[0] = promptForFileName());
if (fileName[0] != null) {
Query<Object> saveTraceDataQuery = new Query<Object>() {
Query<Object> saveTraceDataQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@ -110,7 +110,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
return false;
}
Query<Boolean> canSaveQuery = new Query<Boolean>() {
Query<Boolean> canSaveQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectNextTraceRecordCommand.java
View file

@ -71,7 +71,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
return;
}
Query<Object> selectRecordQuery = new Query<Object>() {
Query<Object> selectRecordQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@ -129,7 +129,7 @@ public class GdbSelectNextTraceRecordCommand extends AbstractDebugCommand implem
return false;
}
Query<Boolean> canSelectRecordQuery = new Query<Boolean>() {
Query<Boolean> canSelectRecordQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Boolean> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSelectPrevTraceRecordCommand.java
View file

@ -73,7 +73,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
return;
}
Query<Object> selectRecordQuery = new Query<Object>() {
Query<Object> selectRecordQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@ -123,7 +123,7 @@ public class GdbSelectPrevTraceRecordCommand extends AbstractDebugCommand implem
return false;
}
Query<Boolean> canSelectRecordQuery = new Query<Boolean>() {
Query<Boolean> canSelectRecordQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Boolean> rm) {
final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStartTracingCommand.java
View file

@ -66,7 +66,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta
return;
}
Query<Object> startTracingQuery = new Query<Object>() {
Query<Object> startTracingQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
final IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@ -110,7 +110,7 @@ public class GdbStartTracingCommand extends AbstractDebugCommand implements ISta
return false;
}
Query<Boolean> canStartTracingQuery = new Query<Boolean>() {
Query<Boolean> canStartTracingQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbStopTracingCommand.java
View file

@ -64,7 +64,7 @@ public class GdbStopTracingCommand extends AbstractDebugCommand implements IStop
return;
}
Query<Object> stopTracingQuery = new Query<Object>() {
Query<Object> stopTracingQuery = new Query<>() {
@Override
public void execute(final DataRequestMonitor<Object> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);
@ -99,7 +99,7 @@ public class GdbStopTracingCommand extends AbstractDebugCommand implements IStop
return false;
}
Query<Boolean> canStopTracingQuery = new Query<Boolean>() {
Query<Boolean> canStopTracingQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
IGDBTraceControl traceControl = fTracker.getService(IGDBTraceControl.class);

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/AttachProcessHandler.java
View file

@ -91,7 +91,7 @@ public class AttachProcessHandler extends AbstractHandler {
return false;
}
Query<Boolean> canConnectQuery = new Query<Boolean>() {
Query<Boolean> canConnectQuery = new Query<>() {
@Override
public void execute(DataRequestMonitor<Boolean> rm) {
BundleContext c = GdbUIPlugin.getDefault().getBundle().getBundleContext();

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/osview/OSResourcesView.java
View file

@ -297,7 +297,7 @@ public class OSResourcesView extends ViewPart implements DsfSession.SessionEnded
GdbLaunch l = (GdbLaunch) obj;
final DsfServicesTracker tracker = new DsfServicesTracker(GdbPlugin.getBundleContext(),
l.getSession().getId());
Query<IDMContext> contextQuery = new Query<IDMContext>() {
Query<IDMContext> contextQuery = new Query<>() {
@Override
protected void execute(DataRequestMonitor<IDMContext> rm) {
ICommandControlService commandControl = tracker.getService(ICommandControlService.class);

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlModel.java
View file

@ -245,7 +245,7 @@ public class TraceControlModel {
return null;
}
Query<ITraceVariableDMData[]> query = new Query<ITraceVariableDMData[]>() {
Query<ITraceVariableDMData[]> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<ITraceVariableDMData[]> rm) {
@ -292,7 +292,7 @@ public class TraceControlModel {
TracepointsMessages.TraceControlView_create_variable_error);
}
Query<String> query = new Query<String>() {
Query<String> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<String> rm) {

4
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java
View file

@ -122,7 +122,7 @@ public class GdbVariableVMNode extends VariableVMNode {
getSession().getExecutor().execute(() -> {
final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
if (expressionService != null) {
final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<>(
getSession().getExecutor(), null) {
@Override
public void handleCompleted() {
@ -161,7 +161,7 @@ public class GdbVariableVMNode extends VariableVMNode {
getSession().getExecutor().execute(() -> {
final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
if (expressionService != null) {
final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<IExpressionDMAddress>(
final DataRequestMonitor<IExpressionDMAddress> drm = new DataRequestMonitor<>(
getSession().getExecutor(), null) {
@Override
public void handleCompleted() {

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/GdbPlugin.java
View file

@ -114,7 +114,7 @@ public class GdbPlugin extends Plugin {
if (launch instanceof GdbLaunch && ((GdbLaunch) launch).getSession().isActive()) {
final GdbLaunch gdbLaunch = (GdbLaunch) launch;
Query<Object> launchShutdownQuery = new Query<Object>() {
Query<Object> launchShutdownQuery = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Object> rm) {
gdbLaunch.shutdownSession(rm);

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
View file

@ -104,7 +104,7 @@ public class CoreBuildLocalDebugLaunchDelegate extends CoreBuildLaunchConfigDele
gdbLaunch.addCLIProcess(gdbLaunch.getGDBPath().toOSString() + " (" + gdbVersion + ")"); //$NON-NLS-1$ //$NON-NLS-2$
Query<Object> ready = new Query<Object>() {
Query<Object> ready = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(

5
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses.java
View file

@ -235,7 +235,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
final DataRequestMonitor<IDMContext> rm) {
final IMIContainerDMContext containerDmc = createContainerContext(procCtx, MIProcesses.UNIQUE_GROUP_ID);
DataRequestMonitor<MIInfo> attachRm = new ImmediateDataRequestMonitor<MIInfo>(rm) {
DataRequestMonitor<MIInfo> attachRm = new ImmediateDataRequestMonitor<>(rm) {
@Override
protected void handleSuccess() {
GDBProcesses.super.attachDebuggerToProcess(procCtx, new ImmediateDataRequestMonitor<IDMContext>(rm) {
@ -602,8 +602,7 @@ public class GDBProcesses extends MIProcesses implements IGDBProcesses {
createConsole(containerDmc, restart, new ImmediateRequestMonitor(requestMonitor) {
@Override
protected void handleSuccess() {
final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<MIInfo>(getExecutor(),
requestMonitor) {
final DataRequestMonitor<MIInfo> execMonitor = new DataRequestMonitor<>(getExecutor(), requestMonitor) {
@Override
protected void handleSuccess() {
if (fBackend.getSessionType() != SessionType.REMOTE) {

3
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
View file

@ -1473,8 +1473,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IGDBProcesse
});
} else {
final DataRequestMonitor<IMIContainerDMContext[]> addExitedDRM = new ImmediateDataRequestMonitor<IMIContainerDMContext[]>(
rm) {
final DataRequestMonitor<IMIContainerDMContext[]> addExitedDRM = new ImmediateDataRequestMonitor<>(rm) {
@Override
protected void handleCompleted() {
List<IMIContainerDMContext> containerDmcs = new ArrayList<>(Arrays.asList(getData()));

3
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
View file

@ -1588,8 +1588,7 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService
// It is important to use an ImmediateExecutor for this RM, to make sure we don't risk getting a new
// call to ExecuteWithTargetAvailable() when we just finished executing the steps.
fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<RequestMonitor>(ImmediateExecutor.getInstance(),
rm) {
fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<>(ImmediateExecutor.getInstance(), rm) {
@Override
protected void handleCompleted() {
assert fOperationsPending.size() == 0;

3
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java
View file

@ -809,8 +809,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpointsExt
expression = adjustWatchPointExpression(attributes, expression);
// The DataRequestMonitor for the add request
DataRequestMonitor<MIBreakInsertInfo> addWatchpointDRM = new DataRequestMonitor<MIBreakInsertInfo>(
getExecutor(), drm) {
DataRequestMonitor<MIBreakInsertInfo> addWatchpointDRM = new DataRequestMonitor<>(getExecutor(), drm) {
@Override
protected void handleSuccess() {

3
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
View file

@ -1383,8 +1383,7 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
// It is important to use an ImmediateExecutor for this RM, to make sure we don't risk getting a new
// call to ExecuteWithTargetAvailable() when we just finished executing the steps.
fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<RequestMonitor>(ImmediateExecutor.getInstance(),
rm) {
fExecuteQueuedOpsStepMonitor = new MultiRequestMonitor<>(ImmediateExecutor.getInstance(), rm) {
@Override
protected void handleCompleted() {
assert fOperationsPending.size() == 0;

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
View file

@ -1525,7 +1525,7 @@ public class MIVariableManager implements ICommandControl {
}
}
final DataRequestMonitor<ChildFullExpressionInfo> childPathRm = new DataRequestMonitor<ChildFullExpressionInfo>(
final DataRequestMonitor<ChildFullExpressionInfo> childPathRm = new DataRequestMonitor<>(
fSession.getExecutor(), countingRm) {
@Override
protected void handleSuccess() {

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/MILogActionEnabler.java
View file

@ -46,7 +46,7 @@ public class MILogActionEnabler implements ILogActionEnabler {
@Override
public String evaluateExpression(final String expression) throws Exception {
// Use a Query to synchronize the call
Query<String> query = new Query<String>() {
Query<String> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<String> drm) {
final IExpressions expressionService = fServiceTracker.getService(IExpressions.class);

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIBackendCLIProcess.java
View file

@ -99,7 +99,7 @@ public class MIBackendCLIProcess extends AbstractCLIProcess {
}
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
if (!DsfSession.isSessionActive(getSession().getId()) || isDisposed()

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java
View file

@ -295,7 +295,7 @@ public class MIInferiorProcess extends Process implements IEventListener, IComma
// with multi-process (it is re-used by the different processes).
// We use it still for GDB 7.2, since the single-process case is the most common.
try {
Query<Integer> exitCodeQuery = new Query<Integer>() {
Query<Integer> exitCodeQuery = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Integer> rm) {
// Guard against session disposed.

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
View file

@ -47,7 +47,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (adapterType.equals(ICSourceNotFoundDescription.class) && adaptableObject instanceof IFrameDMContext) {
final IFrameDMContext frameDMC = (IFrameDMContext) adaptableObject;
Query<IStack.IFrameDMData> query = new Query<IStack.IFrameDMData>() {
Query<IStack.IFrameDMData> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<IStack.IFrameDMData> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

8
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/AbstractDsfRegisterGroupActions.java
View file

@ -202,7 +202,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
protected boolean canAddRegisterGroup(IWorkbenchPart part, IStructuredSelection selection) {
try {
final SelectionDMContext selectionContext = new SelectionDMContext(selection);
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
IRegisters2 registersService;
@ -267,7 +267,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
return false;
}
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Boolean> rm) {
IRegisters2 registersService;
@ -346,7 +346,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
}
//Prepare to Query the service and check if the selected groups can be removed
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
IRegisters2 regService;
@ -422,7 +422,7 @@ public abstract class AbstractDsfRegisterGroupActions extends AbstractHandler {
}
//Prepare to Query the service
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
IRegisters2 regService;

8
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
View file

@ -51,7 +51,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -84,7 +84,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -125,7 +125,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -158,7 +158,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

8
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
View file

@ -57,7 +57,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -95,7 +95,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -136,7 +136,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -169,7 +169,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

8
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
View file

@ -60,7 +60,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -99,7 +99,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -140,7 +140,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
DsfSession session = DsfSession.getSession(fContext.getSessionId());
if (session != null && session.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -173,7 +173,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
if (session != null && session.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
View file

@ -230,7 +230,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i
if (frameDmc != null) {
final DsfSession dsfSession = DsfSession.getSession(frameDmc.getSessionId());
if (dsfSession != null) {
Callable<IExpressionDMContext> callable = new Callable<IExpressionDMContext>() {
Callable<IExpressionDMContext> callable = new Callable<>() {
@Override
public IExpressionDMContext call() throws Exception {
DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

4
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionCommand.java
View file

@ -118,7 +118,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand
if (fSession != null && fSession.isActive()) {
try {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
IRunControl3 runControl = fTracker.getService(IRunControl3.class);
@ -149,7 +149,7 @@ public class DsfStepIntoSelectionCommand extends AbstractDebugCommand
if (fSession != null && fSession.isActive()) {
Throwable exception = null;
try {
Query<Object> query = new Query<Object>() {
Query<Object> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Object> rm) {
IRunControl3 runControl = fTracker.getService(IRunControl3.class);

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
View file

@ -166,7 +166,7 @@ public class BreakpointVMProvider extends AbstractCachingVMProvider {
private final Map<TreePath, ContainerBreakpointsCache> fContainerBreakpointsCacheMap = new HashMap<>();
private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<IBreakpoint[]>(getExecutor()) {
private DataCache<IBreakpoint[]> fFilteredBreakpointsCache = new DataCache<>(getExecutor()) {
@Override
protected void retrieve(org.eclipse.cdt.dsf.concurrent.DataRequestMonitor<IBreakpoint[]> rm) {
calcFileteredBreakpoints(rm);

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/DataCache.java
View file

@ -110,7 +110,7 @@ abstract class DataCache<V> {
boolean first = fWaitingList.isEmpty();
fWaitingList.add(rm);
if (first) {
fRm = new DataRequestMonitor<V>(fExecutor, null) {
fRm = new DataRequestMonitor<>(fExecutor, null) {
@Override
protected void handleCompleted() {
if (!isCanceled()) {

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
View file

@ -80,7 +80,7 @@ public abstract class AbstractExpressionVMNode extends AbstractDMVMNode implemen
} else {
final List<Object> elements = getData();
final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<DataRequestMonitor<Boolean>>(
final MultiRequestMonitor<DataRequestMonitor<Boolean>> multiRm = new MultiRequestMonitor<>(
getExecutor(), null) {
@Override
protected void handleCompleted() {

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
View file

@ -197,7 +197,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode implements IElementL
// the request monitor when it is finished. The request monitor
// will in turn set the element in the update argument in this method.
((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression,
new DataRequestMonitor<Object>(getVMProvider().getExecutor(), multiRm) {
new DataRequestMonitor<>(getVMProvider().getExecutor(), multiRm) {
@Override
protected void handleSuccess() {
update.setChild(getData(), childIndex);

11
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderContentStragegy.java
View file

@ -51,7 +51,7 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide
private void updateExpressionWithNode(final IExpressionVMNode node, final IExpressionUpdate update) {
// Call the expression node to parse the expression and fill in the value.
node.update(new VMExpressionUpdate(update, update.getExpression(),
new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
@Override
protected void handleSuccess() {
// Check if the evaluated node has child expression nodes.
@ -63,10 +63,11 @@ public class ExpressionVMProviderContentStragegy extends DefaultVMContentProvide
update.getExpression());
if (matchingNode != null && !matchingNode.equals(node)) {
updateExpressionWithNode(matchingNode, new VMExpressionUpdate(
update.getElementPath().createChildPath(getData()), update.getViewerInput(),
update.getPresentationContext(), update.getExpression(),
new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
updateExpressionWithNode(matchingNode,
new VMExpressionUpdate(update.getElementPath().createChildPath(getData()),
update.getViewerInput(), update.getPresentationContext(),
update.getExpression(),
new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
@Override
protected void handleSuccess() {

6
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
View file

@ -97,9 +97,9 @@ public class ExpressionVMProviderModelProxyStrategy extends DefaultVMModelProxyS
buildNodeDeltaForExpression(matchingNode, expression, expressionElementIdx, event,
parentDelta, path, rm);
} else {
getExpressionVMProvider().update(new VMExpressionUpdate(parentDelta,
getVMProvider().getPresentationContext(), expression,
new DataRequestMonitor<Object>(getVMProvider().getExecutor(), rm) {
getExpressionVMProvider().update(
new VMExpressionUpdate(parentDelta, getVMProvider().getPresentationContext(),
expression, new DataRequestMonitor<>(getVMProvider().getExecutor(), rm) {
@Override
protected void handleSuccess() {
buildDeltaForExpressionElement(node, expression, getData(),

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
View file

@ -219,7 +219,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
// the request monitor when it is finished. The request monitor
// will in turn set the element in the update argument in this method.
((ExpressionVMProvider) getVMProvider()).update(new VMExpressionUpdate(update, expression,
new ViewerDataRequestMonitor<Object>(getVMProvider().getExecutor(), update) {
new ViewerDataRequestMonitor<>(getVMProvider().getExecutor(), update) {
@Override
protected void handleSuccess() {
update.setChild(getData(), 0);

2
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
View file

@ -126,7 +126,7 @@ public class WatchExpressionCellModifier implements ICellModifier {
if (session == null) {
return null;
}
Query<String> query = new Query<String>() {
Query<String> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<String> rm) {
// Since cell modifier does not provide the fully qualified

4
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
View file

@ -100,7 +100,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
final IExecutionDMContext execContext = DMContexts.getAncestorOfType(dmContext,
IExecutionDMContext.class);
if (execContext != null) {
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(DataRequestMonitor<Boolean> rm) {
DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),
@ -197,7 +197,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
return false;
}
Query<Boolean> query = new Query<Boolean>() {
Query<Boolean> query = new Query<>() {
@Override
protected void execute(final DataRequestMonitor<Boolean> rm) {
DsfServicesTracker servicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(),

Some files were not shown because too many files have changed in this diff Show more