From 71ea7fe4f8238755d1df6fc61efeb5f57e3bf6ce Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 4 Jan 2010 04:01:52 +0000 Subject: [PATCH] Cosmetics. --- .../cdt/internal/core/index/IWritableIndexFragment.java | 4 ++-- .../eclipse/cdt/internal/core/index/WritableCIndex.java | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IWritableIndexFragment.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IWritableIndexFragment.java index 713a6087020..137d950c63a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IWritableIndexFragment.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IWritableIndexFragment.java @@ -58,14 +58,14 @@ public interface IWritableIndexFragment extends IIndexFragment { * Acquires a write lock, while giving up a certain amount of read locks. */ void acquireWriteLock(int giveupReadLockCount) throws InterruptedException; - + /** * Releases a write lock, reestablishing a certain amount of read locks. * @param establishReadLockCount amount of read-locks to establish * @param flush if true changes are flushed to disk */ void releaseWriteLock(int establishReadLockCount, boolean flush); - + /** * Write the key, value mapping to the fragment properties. If a mapping for the * same key already exists, it is overwritten. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java index 3efb8e4ce5a..2196b733844 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java @@ -61,12 +61,10 @@ public class WritableCIndex extends CIndex implements IWritableIndex { public void setFileContent(IIndexFragmentFile file, int linkageID, IncludeInformation[] includes, IASTPreprocessorStatement[] macros, IASTName[][] names, ASTFilePathResolver resolver) throws CoreException { - IIndexFragment indexFragment = file.getIndexFragment(); if (!isWritableFragment(indexFragment)) { assert false : "Attempt to update file of read-only fragment"; //$NON-NLS-1$ - } - else { + } else { for (IncludeInformation ii : includes) { if (ii.fLocation != null) { ii.fTargetFile= addFile(linkageID, ii.fLocation); @@ -89,8 +87,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex { IIndexFragment indexFragment = file.getIndexFragment(); if (!isWritableFragment(indexFragment)) { assert false : "Attempt to clear file of read-only fragment"; //$NON-NLS-1$ - } - else { + } else { ((IWritableIndexFragment) indexFragment).clearFile(file, clearedContexts); } }