From cc65236de543ce8388b3a3c0558633cdbe780d03 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 13 May 2014 12:06:39 -0700 Subject: [PATCH] Cosmetics. --- .../eclipse/cdt/internal/core/pdom/PDOM.java | 42 +++++++++---------- .../cdt/internal/core/pdom/dom/PDOMMacro.java | 8 ++-- .../core/pdom/dom/PDOMMacroContainer.java | 12 +++--- .../pdom/dom/PDOMMacroDefinitionName.java | 17 +++++++- .../core/pdom/dom/PDOMMacroReferenceName.java | 6 +-- 5 files changed, 50 insertions(+), 35 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java index 8e37de1ff32..e15c1db6d56 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java @@ -297,8 +297,8 @@ public class PDOM extends PlatformObject implements IPDOM { } public static class ChangeEvent { - public Set fClearedFiles= new HashSet(); - public Set fFilesWritten= new HashSet(); + public Set fClearedFiles= new HashSet<>(); + public Set fFilesWritten= new HashSet<>(); private boolean fCleared; private boolean fReloaded; private boolean fNewFiles; @@ -356,11 +356,11 @@ public class PDOM extends PlatformObject implements IPDOM { private PDOMTagIndex tagIndex; private BTree indexOfDefectiveFiles; private BTree indexOfFiledWithUnresolvedIncludes; - private final Map fLinkageIDCache = new HashMap(); + private final Map fLinkageIDCache = new HashMap<>(); private File fPath; private final IIndexLocationConverter locationConverter; private final Map fPDOMLinkageFactoryCache; - private final HashMap fResultCache= new HashMap(); + private final HashMap fResultCache= new HashMap<>(); private List listeners; protected ChangeEvent fEvent= new ChangeEvent(); @@ -375,7 +375,7 @@ public class PDOM extends PlatformObject implements IPDOM { loadDatabase(dbPath, cache); this.locationConverter = locationConverter; if (sDEBUG_LOCKS) { - fLockDebugging= new HashMap(); + fLockDebugging= new HashMap<>(); System.out.println("Debugging PDOM Locks"); //$NON-NLS-1$ } } @@ -452,7 +452,7 @@ public class PDOM extends PlatformObject implements IPDOM { @Override public void addListener(IListener listener) { if (listeners == null) - listeners = new LinkedList(); + listeners = new LinkedList<>(); listeners.add(listener); } @@ -562,7 +562,7 @@ public class PDOM extends PlatformObject implements IPDOM { } private IIndexFragmentFile[] getFiles(BTree index) throws CoreException { - final List files = new ArrayList(); + final List files = new ArrayList<>(); index.accept(new IBTreeVisitor() { @Override public int compare(long record) throws CoreException { @@ -647,9 +647,9 @@ public class PDOM extends PlatformObject implements IPDOM { private final Pattern[] pattern; private final IProgressMonitor monitor; - private final ArrayList currentPath= new ArrayList(); - private final ArrayList matchStack= new ArrayList(); - private final List bindings = new ArrayList(); + private final ArrayList currentPath= new ArrayList<>(); + private final ArrayList matchStack= new ArrayList<>(); + private final List bindings = new ArrayList<>(); private final boolean isFullyQualified; private BitSet matchesUpToLevel; private final IndexFilter filter; @@ -831,7 +831,7 @@ public class PDOM extends PlatformObject implements IPDOM { monitor= new NullProgressMonitor(); } - Pattern[] patterns= new Pattern[]{pattern}; + Pattern[] patterns= new Pattern[] { pattern }; Boolean caseSensitive= getCaseSensitive(patterns); if (caseSensitive != null) { char[][] simpleNames= extractSimpleNames(patterns); @@ -845,7 +845,7 @@ public class PDOM extends PlatformObject implements IPDOM { } } - List result= new ArrayList(); + List result= new ArrayList<>(); for (PDOMLinkage linkage : getLinkageList()) { if (filter.acceptLinkage(linkage)) { try { @@ -1093,7 +1093,7 @@ public class PDOM extends PlatformObject implements IPDOM { return fLinkageIDCache.get(linkage.getLinkageID()); } - private ThreadLocal inProgress = new ThreadLocal(); + private ThreadLocal inProgress = new ThreadLocal<>(); @Override public IIndexFragmentBinding adaptBinding(IBinding binding) throws CoreException { @@ -1144,7 +1144,7 @@ public class PDOM extends PlatformObject implements IPDOM { @Override public IIndexFragmentName[] findNames(IBinding binding, int options) throws CoreException { - ArrayList names= new ArrayList(); + ArrayList names= new ArrayList<>(); IIndexFragmentBinding myBinding= adaptBinding(binding); if (myBinding instanceof PDOMBinding) { PDOMBinding pdomBinding = (PDOMBinding) myBinding; @@ -1235,7 +1235,7 @@ public class PDOM extends PlatformObject implements IPDOM { public IIndexFragmentInclude[] findIncludedBy(IIndexFragmentFile file) throws CoreException { PDOMFile pdomFile= adaptFile(file); if (pdomFile != null) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (PDOMInclude i= pdomFile.getFirstIncludedBy(); i != null; i= i.getNextInIncludedBy()) { if (i.getIncludedBy().getTimestamp() > 0) { result.add(i); @@ -1273,7 +1273,7 @@ public class PDOM extends PlatformObject implements IPDOM { } private IIndexFragmentBinding[] findBindingsForPrefixOrContentAssist(char[] prefix, boolean filescope, boolean isContentAssist, boolean caseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException { - ArrayList result= new ArrayList(); + ArrayList result= new ArrayList<>(); for (PDOMLinkage linkage : getLinkageList()) { if (filter.acceptLinkage(linkage)) { PDOMBinding[] bindings; @@ -1306,7 +1306,7 @@ public class PDOM extends PlatformObject implements IPDOM { public IIndexFragmentBinding[] findBindings(char[] name, boolean filescope, boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException { - ArrayList result= new ArrayList(); + ArrayList result= new ArrayList<>(); try { for (PDOMLinkage linkage : getLinkageList()) { if (filter.acceptLinkage(linkage)) { @@ -1345,7 +1345,7 @@ public class PDOM extends PlatformObject implements IPDOM { } public IIndexFragmentBinding[] findMacroContainers(char[] prefix, boolean isPrefix, boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException { - ArrayList result= new ArrayList(); + ArrayList result= new ArrayList<>(); try { for (PDOMLinkage linkage : getLinkageList()) { if (filter.acceptLinkage(linkage)) { @@ -1363,7 +1363,7 @@ public class PDOM extends PlatformObject implements IPDOM { @Override public IIndexMacro[] findMacros(char[] prefix, boolean isPrefix, boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException { - ArrayList result= new ArrayList(); + ArrayList result= new ArrayList<>(); try { for (PDOMLinkage linkage : getLinkageList()) { if (filter.acceptLinkage(linkage)) { @@ -1496,7 +1496,7 @@ public class PDOM extends PlatformObject implements IPDOM { if (linkageID == ILinkage.C_LINKAGE_ID || linkageID == ILinkage.CPP_LINKAGE_ID) { PDOMMacroContainer container= linkage.findMacroContainer(name); if (container != null) { - return new PDOMMacroContainer[] {container}; + return new PDOMMacroContainer[] { container }; } } } @@ -1623,7 +1623,7 @@ public class PDOM extends PlatformObject implements IPDOM { static class DebugLockInfo { int fReadLocks; int fWriteLocks; - List fTraces= new ArrayList(); + List fTraces= new ArrayList<>(); public int addTrace() { fTraces.add(Thread.currentThread().getStackTrace()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java index ecf4993b2fb..7329befab58 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java @@ -130,9 +130,9 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { // Delete from the binding chain PDOMMacro prevName = getPrevInContainer(); PDOMMacro nextName = getNextInContainer(); - if (prevName != null) + if (prevName != null) { prevName.setNextInContainer(nextName); - else { + } else { PDOMMacroContainer container= getContainer(); container.setFirstDefinition(nextName); if (nextName == null && container.isOrphaned()) { @@ -218,7 +218,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { try { IString plist= getParamListInDB(); if (plist != null) { - List paramList = new ArrayList(); + List paramList = new ArrayList<>(); final char[] cplist= plist.getChars(); final int end = cplist.length; int from= 0; @@ -264,7 +264,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation { return getContainer().getNameCharArray(); } catch (CoreException e) { CCorePlugin.log(e); - return new char[] {' '}; + return new char[] { ' ' }; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java index dc1875cbdb4..97a9727dd84 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java @@ -10,6 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexMacro; @@ -21,9 +24,6 @@ import org.eclipse.cdt.internal.core.index.IIndexScope; import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.core.runtime.CoreException; -import java.util.ArrayList; -import java.util.List; - /** * A container collecting definitions and references for macros. * @since 5.0 @@ -56,7 +56,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont public boolean isOrphaned() throws CoreException { Database db = getDB(); return db.getRecPtr(record + FIRST_DEF_OFFSET) == 0 - && db.getRecPtr(record + FIRST_REF_OFFSET) == 0; + && db.getRecPtr(record + FIRST_REF_OFFSET) == 0; } public void addDefinition(PDOMMacro name) throws CoreException { @@ -99,7 +99,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont public IIndexMacro[] getDefinitions() throws CoreException { PDOMMacro macro; - List macros= new ArrayList(); + List macros= new ArrayList<>(); for (macro= getFirstDefinition(); macro != null; macro= macro.getNextInContainer()) { macros.add(macro); } @@ -146,7 +146,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont @Override public String[] getQualifiedName() { - return new String[]{getName()}; + return new String[] { getName() }; } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java index 60228f832c2..3f9dbf7670e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Markus Schorn - initial API and implementation + * Markus Schorn - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom; @@ -33,18 +33,22 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { public boolean couldBePolymorphicMethodCall() throws CoreException { return false; } + @Override public IIndexName[] getEnclosedNames() throws CoreException { return IIndexName.EMPTY_ARRAY; } + @Override public IIndexName getEnclosingDefinition() throws CoreException { return null; } + @Override public IIndexFile getFile() throws CoreException { return fMacro.getFile(); } + @Override public int getNodeLength() { return fMacro.getNodeLength(); @@ -53,34 +57,42 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { public int getNodeOffset() { return fMacro.getNodeOffset(); } + @Override public boolean isBaseSpecifier() throws CoreException { return false; } + @Override public boolean isReadAccess() throws CoreException { return false; } + @Override public boolean isWriteAccess() throws CoreException { return false; } + @Override public IASTFileLocation getFileLocation() { return fMacro; } + @Override public boolean isDeclaration() { return false; } + @Override public boolean isDefinition() { return true; } + @Override public boolean isReference() { return false; } + @Override public boolean isInlineNamespaceDefinition() { return false; @@ -91,6 +103,7 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { public char[] toCharArray() { return fMacro.getNameCharArray(); } + @Override public String toString() { return new String(getSimpleID()); @@ -100,10 +113,12 @@ class PDOMMacroDefinitionName implements IIndexFragmentName { public char[] getSimpleID() { return fMacro.getNameCharArray(); } + @Override public IIndexFragmentBinding getBinding() { return fMacro; } + @Override public IIndexFragment getIndexFragment() { return fMacro.getFragment(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java index dfde12a3978..c0937d86f67 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java @@ -6,9 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX - Initial API and implementation - * Markus Schorn (Wind River Systems) - * Sergey Prigogin (Google) + * QNX - Initial API and implementation + * Markus Schorn (Wind River Systems) + * Sergey Prigogin (Google) *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.dom;