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

Fix indexer progress message, follow up for bug 232155.

Browse source
This commit is contained in:
Markus Schorn 2008-05-16 12:28:25 +00:00
parent 0502665ec0
commit 54ab181228
2 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java
View file

@ -25,6 +25,7 @@ import org.eclipse.cdt.internal.core.pdom.IndexerProgress;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
/** /**
* A task for index updates. * A task for index updates.
@ -59,13 +60,13 @@ public abstract class StandaloneIndexerTask extends AbstractIndexerTask {
} }
} }
private static Object[] concat(Collection added, Collection changed) { private static Object[] concat(Collection<?> added, Collection<?> changed) {
Object[] result= new Object[added.size() + changed.size()]; Object[] result= new Object[added.size() + changed.size()];
int i=0; int i=0;
for (Iterator iterator = added.iterator(); iterator.hasNext();) { for (Iterator<?> iterator = added.iterator(); iterator.hasNext();) {
result[i++]= iterator.next(); result[i++]= iterator.next();
} }
for (Iterator iterator = changed.iterator(); iterator.hasNext();) { for (Iterator<?> iterator = changed.iterator(); iterator.hasNext();) {
result[i++]= iterator.next(); result[i++]= iterator.next();
} }
return result; return result;
@ -190,14 +191,13 @@ public abstract class StandaloneIndexerTask extends AbstractIndexerTask {
// TODO: find a way to do non-OSGi NLS // TODO: find a way to do non-OSGi NLS
switch(kind) { switch(kind) {
case parsingFileTask: case parsingFileTask:
return new String("parsing {0} ({1})"); //$NON-NLS-1$ return NLS.bind("parsing {0} ({1})", arguments); //$NON-NLS-1$
case errorWhileParsing: case errorWhileParsing:
return new String("Error while parsing {0}."); //$NON-NLS-1$ return NLS.bind("Error while parsing {0}.", arguments); //$NON-NLS-1$
case tooManyIndexProblems: case tooManyIndexProblems:
return new String("Too many errors while indexing, stopping indexer."); //$NON-NLS-1$ return "Too many errors while indexing, stopping indexer."; //$NON-NLS-1$
} }
return null; return null;

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

@ -11,7 +11,6 @@
package org.eclipse.cdt.internal.core.pdom; package org.eclipse.cdt.internal.core.pdom;
import java.net.URI; import java.net.URI;
import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
@ -92,7 +91,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
public ICPPUsingDirective[] fDirectives; public ICPPUsingDirective[] fDirectives;
} }
protected enum MessageKind {parsingFileTask, errorWhileParsing, tooManyIndexProblems}; protected enum MessageKind {parsingFileTask, errorWhileParsing, tooManyIndexProblems}
private int fUpdateFlags= IIndexManager.UPDATE_ALL; private int fUpdateFlags= IIndexManager.UPDATE_ALL;
private boolean fIndexHeadersWithoutContext= true; private boolean fIndexHeadersWithoutContext= true;
@ -199,9 +198,6 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
} }
} }
/**
* @return
*/
protected IParserLogService getLogService() { protected IParserLogService getLogService() {
return ParserUtil.getParserLogService(); return ParserUtil.getParserLogService();
} }
@ -444,8 +440,8 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
if (fShowActivity) { if (fShowActivity) {
System.out.println("Indexer: parsing " + filePath + " up front"); //$NON-NLS-1$ //$NON-NLS-2$ System.out.println("Indexer: parsing " + filePath + " up front"); //$NON-NLS-1$ //$NON-NLS-2$
} }
monitor.subTask(MessageFormat.format(getMessage(MessageKind.parsingFileTask), monitor.subTask(getMessage(MessageKind.parsingFileTask,
new Object[]{fileName, path.removeLastSegments(1).toString()})); fileName, path.removeLastSegments(1).toString()));
AbstractLanguage[] langs= getLanguages(fileName); AbstractLanguage[] langs= getLanguages(fileName);
for (AbstractLanguage lang : langs) { for (AbstractLanguage lang : langs) {
@ -593,8 +589,8 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
if (fShowActivity) { if (fShowActivity) {
System.out.println("Indexer: parsing " + path.toOSString()); //$NON-NLS-1$ System.out.println("Indexer: parsing " + path.toOSString()); //$NON-NLS-1$
} }
pm.subTask(MessageFormat.format(getMessage(MessageKind.parsingFileTask), pm.subTask(getMessage(MessageKind.parsingFileTask,
new Object[]{path.lastSegment(), path.removeLastSegments(1).toString()})); path.lastSegment(), path.removeLastSegments(1).toString()));
long start= System.currentTimeMillis(); long start= System.currentTimeMillis();
IASTTranslationUnit ast= createAST(tu, lang, scanInfo, fASTOptions, pm); IASTTranslationUnit ast= createAST(tu, lang, scanInfo, fASTOptions, pm);
fStatistics.fParsingTime += System.currentTimeMillis()-start; fStatistics.fParsingTime += System.currentTimeMillis()-start;
@ -708,8 +704,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
} }
} }
else { else {
s= CCorePlugin.createStatus( s= CCorePlugin.createStatus(getMessage(MessageKind.errorWhileParsing, file), e);
MessageFormat.format(getMessage(MessageKind.errorWhileParsing), new Object[]{file}), e);
} }
logError(s); logError(s);
if (++fStatistics.fErrorCount > MAX_ERRORS) { if (++fStatistics.fErrorCount > MAX_ERRORS) {
@ -799,18 +794,12 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
protected String getMessage(MessageKind kind, Object... arguments) { protected String getMessage(MessageKind kind, Object... arguments) {
switch (kind) { switch (kind) {
case parsingFileTask: case parsingFileTask:
return NLS.bind(Messages.AbstractIndexerTask_parsingFileTask, return NLS.bind(Messages.AbstractIndexerTask_parsingFileTask, arguments);
arguments);
case errorWhileParsing: case errorWhileParsing:
return NLS.bind(Messages.AbstractIndexerTask_errorWhileParsing, return NLS.bind(Messages.AbstractIndexerTask_errorWhileParsing, arguments);
arguments);
case tooManyIndexProblems: case tooManyIndexProblems:
return NLS.bind(Messages.AbstractIndexerTask_tooManyIndexProblems, return Messages.AbstractIndexerTask_tooManyIndexProblems;
arguments);
} }
return null; return null;
} }