diff options
Diffstat (limited to 'core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search')
11 files changed, 22 insertions, 22 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java index 811dfd17e03..1e51dfd6ab4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchListContentProvider.java @@ -45,12 +45,12 @@ public class CSearchListContentProvider implements IStructuredContentProvider, I @Override public Object[] getElements(Object inputElement) { - Set<String> uncoveredProjects = new HashSet<String>(); + Set<String> uncoveredProjects = new HashSet<>(); CSearchResult result = (CSearchResult) inputElement; Object[] results = result.getElements(); - List<Object> resultList = new ArrayList<Object>(); + List<Object> resultList = new ArrayList<>(); // see which projects returned results for (int i = 0; i < results.length; i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java index ef3d3f77786..1573ae076b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java @@ -176,7 +176,7 @@ public class CSearchPage extends DialogPage implements ISearchPage { } // get the list of elements for the scope - Set<ICElement> elements = new HashSet<ICElement>(); + Set<ICElement> elements = new HashSet<>(); String scopeDescription = ""; //$NON-NLS-1$ switch (getContainer().getSelectedScope()) { case ISearchPageContainer.SELECTED_PROJECTS_SCOPE: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java index 1829ce2c1a8..5ac68d0b04d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPatternQuery.java @@ -77,7 +77,7 @@ public class CSearchPatternQuery extends CSearchQuery { this.patternStr = patternStr.trim(); // Parse the pattern string - List<Pattern> patternList = new ArrayList<Pattern>(); + List<Pattern> patternList = new ArrayList<>(); StringBuilder buff = new StringBuilder(); int n = patternStr.length(); for (int i = 0; i < n; ++i) { @@ -143,7 +143,7 @@ public class CSearchPatternQuery extends CSearchQuery { try { IndexFilter filter = IndexFilter.ALL; IIndexBinding[] bindings = index.findBindings(pattern, false, filter, monitor); - ArrayList<IIndexBinding> matchedBindings = new ArrayList<IIndexBinding>(); + ArrayList<IIndexBinding> matchedBindings = new ArrayList<>(); for (int i = 0; i < bindings.length; ++i) { IIndexBinding pdomBinding = bindings[i]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java index 50ae63025eb..df2e208d8fc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchProviderManager.java @@ -43,7 +43,7 @@ public class CSearchProviderManager { public List<IExternalSearchProvider> getExternalSearchProviders() { if (externalSearchProviders == null) { - externalSearchProviders = new ArrayList<IExternalSearchProvider>(); + externalSearchProviders = new ArrayList<>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); IExtensionPoint indexProviderPoint = registry.getExtensionPoint(SEARCH_PROVIDERS); for (IExtension extension : indexProviderPoint.getExtensions()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java index 421778d7374..9721c95cebc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTreeContentProvider.java @@ -47,7 +47,7 @@ import org.eclipse.jface.viewers.Viewer; public class CSearchTreeContentProvider implements ITreeContentProvider, IPDOMSearchContentProvider { private TreeViewer viewer; private CSearchResult result; - private final Map<Object, Set<Object>> tree = new HashMap<Object, Set<Object>>(); + private final Map<Object, Set<Object>> tree = new HashMap<>(); private final CSearchViewPage fPage; CSearchTreeContentProvider(CSearchViewPage page) { @@ -119,7 +119,7 @@ public class CSearchTreeContentProvider implements ITreeContentProvider, IPDOMSe private boolean insertChild(Object parent, Object child) { Set<Object> children = tree.get(parent); if (children == null) { - children = new HashSet<Object>(); + children = new HashSet<>(); tree.put(parent, children); } return children.add(child); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LRUWorkingSets.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LRUWorkingSets.java index aba35cb0b71..e6fe418b577 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LRUWorkingSets.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LRUWorkingSets.java @@ -40,7 +40,7 @@ public class LRUWorkingSets { int size = 0; public LRUWorkingSets(int size) { - workingSetsCache = new ArrayList<IWorkingSet[]>(size); + workingSetsCache = new ArrayList<>(size); this.size = size; } @@ -56,11 +56,11 @@ public class LRUWorkingSets { } private IWorkingSet[] find(ArrayList<IWorkingSet[]> list, IWorkingSet[] workingSet) { - Set<IWorkingSet> workingSetList = new HashSet<IWorkingSet>(Arrays.asList(workingSet)); + Set<IWorkingSet> workingSetList = new HashSet<>(Arrays.asList(workingSet)); Iterator<IWorkingSet[]> iter = list.iterator(); while (iter.hasNext()) { IWorkingSet[] lruWorkingSets = iter.next(); - Set<IWorkingSet> lruWorkingSetList = new HashSet<IWorkingSet>(Arrays.asList(lruWorkingSets)); + Set<IWorkingSet> lruWorkingSetList = new HashSet<>(Arrays.asList(lruWorkingSets)); if (lruWorkingSetList.equals(workingSetList)) return lruWorkingSets; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java index 35a17dc1c08..2a65e70c469 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LineSearchElement.java @@ -172,8 +172,8 @@ public class LineSearchElement extends CSearchElement { // Sort matches according to their offsets Arrays.sort(matches, MATCHES_COMPARATOR); // Group all matches by lines and create LineSearchElements - List<LineSearchElement> result = new ArrayList<LineSearchElement>(); - List<Match> matchCollector = new ArrayList<Match>(); + List<LineSearchElement> result = new ArrayList<>(); + List<Match> matchCollector = new ArrayList<>(); int minOffset = 0; int lineNumber = 0; int lineOffset = 0; @@ -223,8 +223,8 @@ public class LineSearchElement extends CSearchElement { private static LineSearchElement[] collectLineElements(AbstractCharArray buf, Match[] matches, IIndexFileLocation fileLocation) { - List<LineSearchElement> result = new ArrayList<LineSearchElement>(); - List<Match> matchCollector = new ArrayList<Match>(); + List<LineSearchElement> result = new ArrayList<>(); + List<Match> matchCollector = new ArrayList<>(); boolean skipLF = false; int lineNumber = 1; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java index d904757b565..c6fa83f76b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LinkedNamesFinder.java @@ -77,7 +77,7 @@ public class LinkedNamesFinder { public BindingFinder(IASTTranslationUnit root, IASTNode point) { this.root = root; - locations = new ArrayList<IRegion>(); + locations = new ArrayList<>(); } public void find(IBinding target) { @@ -191,7 +191,7 @@ public class LinkedNamesFinder { private void findMacro(IMacroBinding target) { findBinding(target); char[] nameChars = target.getNameCharArray(); - List<IASTName> ifdefNameStack = new ArrayList<IASTName>(); + List<IASTName> ifdefNameStack = new ArrayList<>(); IASTPreprocessorStatement[] statements = root.getAllPreprocessorStatements(); for (IASTPreprocessorStatement statement : statements) { if (!statement.isPartOfTranslationUnitFile()) { @@ -308,8 +308,8 @@ public class LinkedNamesFinder { } private final ICPPClassType baseClass; - private Set<ICPPClassType> subclasses = new HashSet<ICPPClassType>(); - private Set<IBinding> seenClasses = new HashSet<IBinding>(); + private Set<ICPPClassType> subclasses = new HashSet<>(); + private Set<IBinding> seenClasses = new HashSet<>(); SubclassFinder(ICPPClassType baseClass) { this.baseClass = baseClass; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java index 79628b24431..7e188aaccbf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java @@ -111,7 +111,7 @@ public class DeclarationsSearchGroup extends ActionGroup { } private FindAction[] getWorkingSetActions() { - ArrayList<FindAction> actions = new ArrayList<FindAction>(CSearchUtil.LRU_WORKINGSET_LIST_SIZE); + ArrayList<FindAction> actions = new ArrayList<>(CSearchUtil.LRU_WORKINGSET_LIST_SIZE); Iterator<IWorkingSet[]> iter = CSearchUtil.getLRUWorkingSets().iterator(); while (iter.hasNext()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java index 5e03c3e1d5a..21cd67b8d7a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java @@ -71,7 +71,7 @@ public abstract class FindInWorkingSetAction extends FindAction { if (fWorkingSets == null) { return ICElement.EMPTY_ARRAY; } - List<ICElement> scope = new ArrayList<ICElement>(); + List<ICElement> scope = new ArrayList<>(); for (int i = 0; i < fWorkingSets.length; ++i) { IAdaptable[] elements = fWorkingSets[i].getElements(); for (int j = 0; j < elements.length; ++j) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java index 1a5e10a7bfa..f93aa22ae68 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java @@ -104,7 +104,7 @@ public class ReferencesSearchGroup extends ActionGroup { } private FindAction[] getWorkingSetActions() { - ArrayList<FindAction> actions = new ArrayList<FindAction>(CSearchUtil.LRU_WORKINGSET_LIST_SIZE); + ArrayList<FindAction> actions = new ArrayList<>(CSearchUtil.LRU_WORKINGSET_LIST_SIZE); Iterator<IWorkingSet[]> iter = CSearchUtil.getLRUWorkingSets().iterator(); while (iter.hasNext()) { |