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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2014-05-13 12:06:39 -07:00
parent 08f5b7e52a
commit cc65236de5
5 changed files with 50 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
View file

@ -297,8 +297,8 @@ public class PDOM extends PlatformObject implements IPDOM {
} }
public static class ChangeEvent { public static class ChangeEvent {
public Set<IIndexFileLocation> fClearedFiles= new HashSet<IIndexFileLocation>(); public Set<IIndexFileLocation> fClearedFiles= new HashSet<>();
public Set<IIndexFileLocation> fFilesWritten= new HashSet<IIndexFileLocation>(); public Set<IIndexFileLocation> fFilesWritten= new HashSet<>();
private boolean fCleared; private boolean fCleared;
private boolean fReloaded; private boolean fReloaded;
private boolean fNewFiles; private boolean fNewFiles;
@ -356,11 +356,11 @@ public class PDOM extends PlatformObject implements IPDOM {
private PDOMTagIndex tagIndex; private PDOMTagIndex tagIndex;
private BTree indexOfDefectiveFiles; private BTree indexOfDefectiveFiles;
private BTree indexOfFiledWithUnresolvedIncludes; private BTree indexOfFiledWithUnresolvedIncludes;
private final Map<Integer, PDOMLinkage> fLinkageIDCache = new HashMap<Integer, PDOMLinkage>(); private final Map<Integer, PDOMLinkage> fLinkageIDCache = new HashMap<>();
private File fPath; private File fPath;
private final IIndexLocationConverter locationConverter; private final IIndexLocationConverter locationConverter;
private final Map<String, IPDOMLinkageFactory> fPDOMLinkageFactoryCache; private final Map<String, IPDOMLinkageFactory> fPDOMLinkageFactoryCache;
private final HashMap<Object, Object> fResultCache= new HashMap<Object, Object>(); private final HashMap<Object, Object> fResultCache= new HashMap<>();
private List<IListener> listeners; private List<IListener> listeners;
protected ChangeEvent fEvent= new ChangeEvent(); protected ChangeEvent fEvent= new ChangeEvent();
@ -375,7 +375,7 @@ public class PDOM extends PlatformObject implements IPDOM {
loadDatabase(dbPath, cache); loadDatabase(dbPath, cache);
this.locationConverter = locationConverter; this.locationConverter = locationConverter;
if (sDEBUG_LOCKS) { if (sDEBUG_LOCKS) {
fLockDebugging= new HashMap<Thread, DebugLockInfo>(); fLockDebugging= new HashMap<>();
System.out.println("Debugging PDOM Locks"); //$NON-NLS-1$ System.out.println("Debugging PDOM Locks"); //$NON-NLS-1$
} }
} }
@ -452,7 +452,7 @@ public class PDOM extends PlatformObject implements IPDOM {
@Override @Override
public void addListener(IListener listener) { public void addListener(IListener listener) {
if (listeners == null) if (listeners == null)
listeners = new LinkedList<IListener>(); listeners = new LinkedList<>();
listeners.add(listener); listeners.add(listener);
} }
@ -562,7 +562,7 @@ public class PDOM extends PlatformObject implements IPDOM {
} }
private IIndexFragmentFile[] getFiles(BTree index) throws CoreException { private IIndexFragmentFile[] getFiles(BTree index) throws CoreException {
final List<PDOMFile> files = new ArrayList<PDOMFile>(); final List<PDOMFile> files = new ArrayList<>();
index.accept(new IBTreeVisitor() { index.accept(new IBTreeVisitor() {
@Override @Override
public int compare(long record) throws CoreException { public int compare(long record) throws CoreException {
@ -647,9 +647,9 @@ public class PDOM extends PlatformObject implements IPDOM {
private final Pattern[] pattern; private final Pattern[] pattern;
private final IProgressMonitor monitor; private final IProgressMonitor monitor;
private final ArrayList<PDOMNamedNode> currentPath= new ArrayList<PDOMNamedNode>(); private final ArrayList<PDOMNamedNode> currentPath= new ArrayList<>();
private final ArrayList<BitSet> matchStack= new ArrayList<BitSet>(); private final ArrayList<BitSet> matchStack= new ArrayList<>();
private final List<PDOMNamedNode> bindings = new ArrayList<PDOMNamedNode>(); private final List<PDOMNamedNode> bindings = new ArrayList<>();
private final boolean isFullyQualified; private final boolean isFullyQualified;
private BitSet matchesUpToLevel; private BitSet matchesUpToLevel;
private final IndexFilter filter; private final IndexFilter filter;
@ -831,7 +831,7 @@ public class PDOM extends PlatformObject implements IPDOM {
monitor= new NullProgressMonitor(); monitor= new NullProgressMonitor();
} }
Pattern[] patterns= new Pattern[]{pattern}; Pattern[] patterns= new Pattern[] { pattern };
Boolean caseSensitive= getCaseSensitive(patterns); Boolean caseSensitive= getCaseSensitive(patterns);
if (caseSensitive != null) { if (caseSensitive != null) {
char[][] simpleNames= extractSimpleNames(patterns); char[][] simpleNames= extractSimpleNames(patterns);
@ -845,7 +845,7 @@ public class PDOM extends PlatformObject implements IPDOM {
} }
} }
List<IIndexFragmentBinding> result= new ArrayList<IIndexFragmentBinding>(); List<IIndexFragmentBinding> result= new ArrayList<>();
for (PDOMLinkage linkage : getLinkageList()) { for (PDOMLinkage linkage : getLinkageList()) {
if (filter.acceptLinkage(linkage)) { if (filter.acceptLinkage(linkage)) {
try { try {
@ -1093,7 +1093,7 @@ public class PDOM extends PlatformObject implements IPDOM {
return fLinkageIDCache.get(linkage.getLinkageID()); return fLinkageIDCache.get(linkage.getLinkageID());
} }
private ThreadLocal<IBinding> inProgress = new ThreadLocal<IBinding>(); private ThreadLocal<IBinding> inProgress = new ThreadLocal<>();
@Override @Override
public IIndexFragmentBinding adaptBinding(IBinding binding) throws CoreException { public IIndexFragmentBinding adaptBinding(IBinding binding) throws CoreException {
@ -1144,7 +1144,7 @@ public class PDOM extends PlatformObject implements IPDOM {
@Override @Override
public IIndexFragmentName[] findNames(IBinding binding, int options) throws CoreException { public IIndexFragmentName[] findNames(IBinding binding, int options) throws CoreException {
ArrayList<IIndexFragmentName> names= new ArrayList<IIndexFragmentName>(); ArrayList<IIndexFragmentName> names= new ArrayList<>();
IIndexFragmentBinding myBinding= adaptBinding(binding); IIndexFragmentBinding myBinding= adaptBinding(binding);
if (myBinding instanceof PDOMBinding) { if (myBinding instanceof PDOMBinding) {
PDOMBinding pdomBinding = (PDOMBinding) myBinding; PDOMBinding pdomBinding = (PDOMBinding) myBinding;
@ -1235,7 +1235,7 @@ public class PDOM extends PlatformObject implements IPDOM {
public IIndexFragmentInclude[] findIncludedBy(IIndexFragmentFile file) throws CoreException { public IIndexFragmentInclude[] findIncludedBy(IIndexFragmentFile file) throws CoreException {
PDOMFile pdomFile= adaptFile(file); PDOMFile pdomFile= adaptFile(file);
if (pdomFile != null) { if (pdomFile != null) {
List<PDOMInclude> result = new ArrayList<PDOMInclude>(); List<PDOMInclude> result = new ArrayList<>();
for (PDOMInclude i= pdomFile.getFirstIncludedBy(); i != null; i= i.getNextInIncludedBy()) { for (PDOMInclude i= pdomFile.getFirstIncludedBy(); i != null; i= i.getNextInIncludedBy()) {
if (i.getIncludedBy().getTimestamp() > 0) { if (i.getIncludedBy().getTimestamp() > 0) {
result.add(i); 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 { private IIndexFragmentBinding[] findBindingsForPrefixOrContentAssist(char[] prefix, boolean filescope, boolean isContentAssist, boolean caseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException {
ArrayList<IIndexFragmentBinding> result= new ArrayList<IIndexFragmentBinding>(); ArrayList<IIndexFragmentBinding> result= new ArrayList<>();
for (PDOMLinkage linkage : getLinkageList()) { for (PDOMLinkage linkage : getLinkageList()) {
if (filter.acceptLinkage(linkage)) { if (filter.acceptLinkage(linkage)) {
PDOMBinding[] bindings; PDOMBinding[] bindings;
@ -1306,7 +1306,7 @@ public class PDOM extends PlatformObject implements IPDOM {
public IIndexFragmentBinding[] findBindings(char[] name, boolean filescope, public IIndexFragmentBinding[] findBindings(char[] name, boolean filescope,
boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException { boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException {
ArrayList<IIndexFragmentBinding> result= new ArrayList<IIndexFragmentBinding>(); ArrayList<IIndexFragmentBinding> result= new ArrayList<>();
try { try {
for (PDOMLinkage linkage : getLinkageList()) { for (PDOMLinkage linkage : getLinkageList()) {
if (filter.acceptLinkage(linkage)) { 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 { public IIndexFragmentBinding[] findMacroContainers(char[] prefix, boolean isPrefix, boolean isCaseSensitive, IndexFilter filter, IProgressMonitor monitor) throws CoreException {
ArrayList<IIndexFragmentBinding> result= new ArrayList<IIndexFragmentBinding>(); ArrayList<IIndexFragmentBinding> result= new ArrayList<>();
try { try {
for (PDOMLinkage linkage : getLinkageList()) { for (PDOMLinkage linkage : getLinkageList()) {
if (filter.acceptLinkage(linkage)) { if (filter.acceptLinkage(linkage)) {
@ -1363,7 +1363,7 @@ public class PDOM extends PlatformObject implements IPDOM {
@Override @Override
public IIndexMacro[] findMacros(char[] prefix, boolean isPrefix, boolean isCaseSensitive, public IIndexMacro[] findMacros(char[] prefix, boolean isPrefix, boolean isCaseSensitive,
IndexFilter filter, IProgressMonitor monitor) throws CoreException { IndexFilter filter, IProgressMonitor monitor) throws CoreException {
ArrayList<IIndexMacro> result= new ArrayList<IIndexMacro>(); ArrayList<IIndexMacro> result= new ArrayList<>();
try { try {
for (PDOMLinkage linkage : getLinkageList()) { for (PDOMLinkage linkage : getLinkageList()) {
if (filter.acceptLinkage(linkage)) { 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) { if (linkageID == ILinkage.C_LINKAGE_ID || linkageID == ILinkage.CPP_LINKAGE_ID) {
PDOMMacroContainer container= linkage.findMacroContainer(name); PDOMMacroContainer container= linkage.findMacroContainer(name);
if (container != null) { 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 { static class DebugLockInfo {
int fReadLocks; int fReadLocks;
int fWriteLocks; int fWriteLocks;
List<StackTraceElement[]> fTraces= new ArrayList<StackTraceElement[]>(); List<StackTraceElement[]> fTraces= new ArrayList<>();
public int addTrace() { public int addTrace() {
fTraces.add(Thread.currentThread().getStackTrace()); fTraces.add(Thread.currentThread().getStackTrace());

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java
View file

@ -130,9 +130,9 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
// Delete from the binding chain // Delete from the binding chain
PDOMMacro prevName = getPrevInContainer(); PDOMMacro prevName = getPrevInContainer();
PDOMMacro nextName = getNextInContainer(); PDOMMacro nextName = getNextInContainer();
if (prevName != null) if (prevName != null) {
prevName.setNextInContainer(nextName); prevName.setNextInContainer(nextName);
else { } else {
PDOMMacroContainer container= getContainer(); PDOMMacroContainer container= getContainer();
container.setFirstDefinition(nextName); container.setFirstDefinition(nextName);
if (nextName == null && container.isOrphaned()) { if (nextName == null && container.isOrphaned()) {
@ -218,7 +218,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
try { try {
IString plist= getParamListInDB(); IString plist= getParamListInDB();
if (plist != null) { if (plist != null) {
List<char[]> paramList = new ArrayList<char[]>(); List<char[]> paramList = new ArrayList<>();
final char[] cplist= plist.getChars(); final char[] cplist= plist.getChars();
final int end = cplist.length; final int end = cplist.length;
int from= 0; int from= 0;
@ -264,7 +264,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
return getContainer().getNameCharArray(); return getContainer().getNameCharArray();
} catch (CoreException e) { } catch (CoreException e) {
CCorePlugin.log(e); CCorePlugin.log(e);
return new char[] {' '}; return new char[] { ' ' };
} }
} }

10
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java
View file

@ -10,6 +10,9 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.pdom.dom; 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.CCorePlugin;
import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexFile;
import org.eclipse.cdt.core.index.IIndexMacro; 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.cdt.internal.core.pdom.db.Database;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import java.util.ArrayList;
import java.util.List;
/** /**
* A container collecting definitions and references for macros. * A container collecting definitions and references for macros.
* @since 5.0 * @since 5.0
@ -99,7 +99,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont
public IIndexMacro[] getDefinitions() throws CoreException { public IIndexMacro[] getDefinitions() throws CoreException {
PDOMMacro macro; PDOMMacro macro;
List<PDOMMacro> macros= new ArrayList<PDOMMacro>(); List<PDOMMacro> macros= new ArrayList<>();
for (macro= getFirstDefinition(); macro != null; macro= macro.getNextInContainer()) { for (macro= getFirstDefinition(); macro != null; macro= macro.getNextInContainer()) {
macros.add(macro); macros.add(macro);
} }
@ -146,7 +146,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont
@Override @Override
public String[] getQualifiedName() { public String[] getQualifiedName() {
return new String[]{getName()}; return new String[] { getName() };
} }
@Override @Override

15
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java
View file

@ -33,18 +33,22 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
public boolean couldBePolymorphicMethodCall() throws CoreException { public boolean couldBePolymorphicMethodCall() throws CoreException {
return false; return false;
} }
@Override @Override
public IIndexName[] getEnclosedNames() throws CoreException { public IIndexName[] getEnclosedNames() throws CoreException {
return IIndexName.EMPTY_ARRAY; return IIndexName.EMPTY_ARRAY;
} }
@Override @Override
public IIndexName getEnclosingDefinition() throws CoreException { public IIndexName getEnclosingDefinition() throws CoreException {
return null; return null;
} }
@Override @Override
public IIndexFile getFile() throws CoreException { public IIndexFile getFile() throws CoreException {
return fMacro.getFile(); return fMacro.getFile();
} }
@Override @Override
public int getNodeLength() { public int getNodeLength() {
return fMacro.getNodeLength(); return fMacro.getNodeLength();
@ -53,34 +57,42 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
public int getNodeOffset() { public int getNodeOffset() {
return fMacro.getNodeOffset(); return fMacro.getNodeOffset();
} }
@Override @Override
public boolean isBaseSpecifier() throws CoreException { public boolean isBaseSpecifier() throws CoreException {
return false; return false;
} }
@Override @Override
public boolean isReadAccess() throws CoreException { public boolean isReadAccess() throws CoreException {
return false; return false;
} }
@Override @Override
public boolean isWriteAccess() throws CoreException { public boolean isWriteAccess() throws CoreException {
return false; return false;
} }
@Override @Override
public IASTFileLocation getFileLocation() { public IASTFileLocation getFileLocation() {
return fMacro; return fMacro;
} }
@Override @Override
public boolean isDeclaration() { public boolean isDeclaration() {
return false; return false;
} }
@Override @Override
public boolean isDefinition() { public boolean isDefinition() {
return true; return true;
} }
@Override @Override
public boolean isReference() { public boolean isReference() {
return false; return false;
} }
@Override @Override
public boolean isInlineNamespaceDefinition() { public boolean isInlineNamespaceDefinition() {
return false; return false;
@ -91,6 +103,7 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
public char[] toCharArray() { public char[] toCharArray() {
return fMacro.getNameCharArray(); return fMacro.getNameCharArray();
} }
@Override @Override
public String toString() { public String toString() {
return new String(getSimpleID()); return new String(getSimpleID());
@ -100,10 +113,12 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
public char[] getSimpleID() { public char[] getSimpleID() {
return fMacro.getNameCharArray(); return fMacro.getNameCharArray();
} }
@Override @Override
public IIndexFragmentBinding getBinding() { public IIndexFragmentBinding getBinding() {
return fMacro; return fMacro;
} }
@Override @Override
public IIndexFragment getIndexFragment() { public IIndexFragment getIndexFragment() {
return fMacro.getFragment(); return fMacro.getFragment();