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

Removed a redundant condition.

Browse source
This commit is contained in:
Sergey Prigogin 2010-01-18 05:28:51 +00:00
parent e2c52d813c
commit 2104825bd7
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,8 +132,8 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
public static Object[] merge(IIndexInclude[] includes, IIndexMacro[] macros) throws CoreException { public static Object[] merge(IIndexInclude[] includes, IIndexMacro[] macros) throws CoreException {
Object[] merged= new Object[includes.length+macros.length]; Object[] merged= new Object[includes.length+macros.length];
int i=0; int i= 0;
int m=0; int m= 0;
int ioffset= getOffset(includes, i); int ioffset= getOffset(includes, i);
int moffset= getOffset(macros, m); int moffset= getOffset(macros, m);
for (int k = 0; k < merged.length; k++) { for (int k = 0; k < merged.length; k++) {
@ -409,7 +409,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
count++; count++;
} else { } else {
boolean update= false; boolean update= false;
if (checkConfig && ifile.getParsedInContext() != null) { if (checkConfig) {
update= isHeaderConfigChange(tu, ifile); update= isHeaderConfigChange(tu, ifile);
} }
update= update || force || (checkTimestamps && fResolver.getLastModified(ifl) != ifile.getTimestamp()); update= update || force || (checkTimestamps && fResolver.getLastModified(ifl) != ifile.getTimestamp());
@ -423,7 +423,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
} }
} }
} }
updateRequestedFiles(count-fFilesToUpdate.length); updateRequestedFiles(count - fFilesToUpdate.length);
fFilesToUpdate= null; fFilesToUpdate= null;
} }
@ -496,7 +496,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
} }
private Integer getFileListKey(int linkageID, boolean isSourceUnit) { private Integer getFileListKey(int linkageID, boolean isSourceUnit) {
Integer key= new Integer(linkageID*2 + (isSourceUnit ? 0 : 1)); Integer key= new Integer(linkageID * 2 + (isSourceUnit ? 0 : 1));
return key; return key;
} }
@ -837,7 +837,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
* swallow this one. * swallow this one.
*/ */
if (e instanceof CoreException) { if (e instanceof CoreException) {
s=((CoreException)e).getStatus(); s=((CoreException) e).getStatus();
if (s.getCode() == CCorePlugin.STATUS_PDOM_TOO_LARGE) { if (s.getCode() == CCorePlugin.STATUS_PDOM_TOO_LARGE) {
if (CCorePlugin.PLUGIN_ID.equals(s.getPlugin())) if (CCorePlugin.PLUGIN_ID.equals(s.getPlugin()))
throw (CoreException) e; throw (CoreException) e;
@ -928,7 +928,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
} }
private static int addToHashcode(int result, String key) { private static int addToHashcode(int result, String key) {
return result*31 + key.hashCode(); return result * 31 + key.hashCode();
} }
public final IndexFileContent getFileContent(int linkageID, IIndexFileLocation ifl) throws CoreException { public final IndexFileContent getFileContent(int linkageID, IIndexFileLocation ifl) throws CoreException {
@ -958,7 +958,6 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
return null; return null;
} }
/** /**
* @return array of linkage IDs that should be parsed * @return array of linkage IDs that should be parsed
*/ */