Skip to main content
summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorsprigogin2011-07-09 15:41:18 -0400
committersprigogin2011-07-14 17:44:44 -0400
commit78f658d473b90cbfbd906845fb93292bdfbe6bb5 (patch)
treea0b65a22e6c9f0d4510c8e02720ef84c4c713f04 /core
parenta33ed9c4929968a5011e56f863b052cbc17b631d (diff)
downloadorg.eclipse.cdt-78f658d473b90cbfbd906845fb93292bdfbe6bb5.tar.gz
org.eclipse.cdt-78f658d473b90cbfbd906845fb93292bdfbe6bb5.tar.xz
org.eclipse.cdt-78f658d473b90cbfbd906845fb93292bdfbe6bb5.zip
Cosmetics.
Diffstat (limited to 'core')
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java10
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java2
-rw-r--r--core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java1
4 files changed, 8 insertions, 9 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java
index 400f7870a4..7cee626ccb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java
@@ -202,7 +202,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
fIsFastIndexer= fastIndexer;
fFilesToUpdate= filesToUpdate;
Collections.addAll(fFilesToRemove, filesToRemove);
- updateRequestedFiles(fFilesToUpdate.length + fFilesToRemove.size());
+ incrementRequestedFilesCount(fFilesToUpdate.length + fFilesToRemove.size());
fUrgentTasks = new LinkedList<AbstractIndexerTask>();
}
@@ -402,7 +402,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
fFilesToUpdate = urgentTask.fFilesToUpdate;
fForceNumberFiles = urgentTask.fForceNumberFiles;
fFilesToRemove = urgentTask.fFilesToRemove;
- updateRequestedFiles(fFilesToUpdate.length + fFilesToRemove.size());
+ incrementRequestedFilesCount(fFilesToUpdate.length + fFilesToRemove.size());
extractFiles(files, indexFilesToRemove, monitor);
removeFilesInIndex(fFilesToRemove, indexFilesToRemove, monitor);
}
@@ -535,7 +535,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
}
}
synchronized (this) {
- updateRequestedFiles(count - fFilesToUpdate.length);
+ incrementRequestedFilesCount(count - fFilesToUpdate.length);
fFilesToUpdate= null;
}
}
@@ -644,14 +644,14 @@ public abstract class AbstractIndexerTask extends PDOMWriter {
for (IIndexFragmentFile ifile : ifiles) {
fIndex.clearFile(ifile, null);
}
- updateRequestedFiles(-1);
+ incrementRequestedFilesCount(-1);
}
for (IIndexFragmentFile ifile : indexFilesToRemove) {
if (monitor.isCanceled()) {
return;
}
fIndex.clearFile(ifile, null);
- updateRequestedFiles(-1);
+ incrementRequestedFilesCount(-1);
}
} finally {
fIndex.releaseWriteLock(1);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java
index 62b1b1285a..d083e5cb78 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java
@@ -531,7 +531,7 @@ abstract public class PDOMWriter {
/**
* Updates current progress information with the provided delta.
*/
- protected final void updateRequestedFiles(int delta) {
+ protected final void incrementRequestedFilesCount(int delta) {
synchronized (fInfo) {
fInfo.fRequestedFilesCount += delta;
}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
index d13ea2cfae..8de0cb7e20 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
@@ -52,8 +52,8 @@ public class WritablePDOM extends PDOM implements IWritableIndexFragment {
this(dbPath, locationConverter, ChunkCache.getSharedInstance(), linkageFactoryMappings);
}
- public WritablePDOM(File dbPath, IIndexLocationConverter locationConverter, ChunkCache cache, Map<String,
- IPDOMLinkageFactory> linkageFactoryMappings) throws CoreException {
+ public WritablePDOM(File dbPath, IIndexLocationConverter locationConverter, ChunkCache cache,
+ Map<String, IPDOMLinkageFactory> linkageFactoryMappings) throws CoreException {
super(dbPath, locationConverter, cache, linkageFactoryMappings);
}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 89ce8262d8..9a928fa878 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -272,7 +272,6 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC
// look up the current range of the marker when the document has been edited
IAnnotationModel model= getDocumentProvider().getAnnotationModel(getEditorInput());
if (model instanceof AbstractMarkerAnnotationModel) {
-
AbstractMarkerAnnotationModel markerModel= (AbstractMarkerAnnotationModel) model;
Position pos= markerModel.getMarkerPosition(marker);
if (pos != null && !pos.isDeleted()) {

Back to the top