diff options
author | John Camelon | 2005-03-22 18:44:31 +0000 |
---|---|---|
committer | John Camelon | 2005-03-22 18:44:31 +0000 |
commit | 56f19f3711a45bf7d58c1eaa23a0094020946512 (patch) | |
tree | 9cc4aefa8ba8b5ac726eeff3cf965c0f9eb4903f | |
parent | c9fa81c5e6dc4a363d12582ae708b1ff27d164b8 (diff) | |
download | org.eclipse.cdt-56f19f3711a45bf7d58c1eaa23a0094020946512.tar.gz org.eclipse.cdt-56f19f3711a45bf7d58c1eaa23a0094020946512.tar.xz org.eclipse.cdt-56f19f3711a45bf7d58c1eaa23a0094020946512.zip |
Fix late coupling of CodeReaderCache.
Allow for cdtparser.jar to build w/out dependencies on cdtcore.jar.
-rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/EmptyCodeReaderCache.java (renamed from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/EmptyCodeReaderCache.java) | 7 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java | 3 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java (renamed from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReaderCache.java) | 17 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java | 2 |
4 files changed, 14 insertions, 15 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/EmptyCodeReaderCache.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/EmptyCodeReaderCache.java index fa511fc1669..68c571802e4 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/EmptyCodeReaderCache.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/EmptyCodeReaderCache.java @@ -6,12 +6,13 @@ * * Contributors: Rational Software - Initial API and implementation ******************************************************************************/ -package org.eclipse.cdt.core.parser; +package org.eclipse.cdt.internal.core.dom.parser; import java.util.Iterator; +import org.eclipse.cdt.core.parser.CodeReader; +import org.eclipse.cdt.core.parser.ICodeReaderCache; import org.eclipse.cdt.internal.core.parser.InternalParserUtil; -import org.eclipse.cdt.internal.core.parser.ast.EmptyIterator; /** * This is an empty implementation of the ICodeReaderCache interface. It is used to implement a @@ -42,7 +43,7 @@ public class EmptyCodeReaderCache implements ICodeReaderCache { * @return */ public CodeReader createReader( String finalPath, Iterator workingCopies ) { - return ParserUtil.createReader(finalPath, workingCopies); + return InternalParserUtil.createFileReader(finalPath); } /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java index bfaf470f8de..d82451ab51c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java @@ -12,9 +12,8 @@ package org.eclipse.cdt.internal.core.parser.scanner2; import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.parser.CodeReader; -import org.eclipse.cdt.core.parser.CodeReaderCache; -import org.eclipse.cdt.core.parser.EmptyCodeReaderCache; import org.eclipse.cdt.core.parser.ICodeReaderCache; +import org.eclipse.cdt.internal.core.dom.parser.EmptyCodeReaderCache; /** * @author jcamelon diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReaderCache.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java index cc29de971f1..cf96514b07f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/CodeReaderCache.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/parser/CodeReaderCache.java @@ -9,7 +9,6 @@ package org.eclipse.cdt.core.parser; -import org.eclipse.cdt.internal.core.parser.InternalParserUtil; import org.eclipse.cdt.internal.core.parser.ast.EmptyIterator; import org.eclipse.cdt.internal.core.util.ILRUCacheable; import org.eclipse.cdt.internal.core.util.LRUCache; @@ -51,7 +50,7 @@ public class CodeReaderCache implements ICodeReaderCache { private CodeReaderLRUCache cache = null; // the actual cache private class UpdateCodeReaderCacheListener implements IResourceChangeListener { - ICodeReaderCache cache = null; + ICodeReaderCache c = null; /** * Create the UpdateCodeReaderCacheListener used to dispatch events to remove CodeReaders @@ -59,12 +58,12 @@ public class CodeReaderCache implements ICodeReaderCache { * @param cache */ public UpdateCodeReaderCacheListener(ICodeReaderCache cache) { - this.cache = cache; + this.c = cache; } private class RemoveCacheJob extends Job { private static final String REMOVE_CACHE = "Remove Cache"; //$NON-NLS-1$ - ICodeReaderCache cache = null; + ICodeReaderCache cache1 = null; IResourceChangeEvent event = null; /** @@ -75,7 +74,7 @@ public class CodeReaderCache implements ICodeReaderCache { */ public RemoveCacheJob(ICodeReaderCache cache, IResourceChangeEvent event) { super(REMOVE_CACHE); - this.cache = cache; + this.cache1 = cache; this.event = event; } @@ -96,8 +95,8 @@ public class CodeReaderCache implements ICodeReaderCache { } } - if (key != null && cache != null) - cache.remove(key); + if (key != null && cache1 != null) + cache1.remove(key); return Status.OK_STATUS; } @@ -108,8 +107,8 @@ public class CodeReaderCache implements ICodeReaderCache { * Identifies when a resource was chaned and schedules a new RemoveCacheJob. */ public void resourceChanged(IResourceChangeEvent event) { - if (cache instanceof CodeReaderCache) - new RemoveCacheJob(cache, event).schedule(); + if (c instanceof CodeReaderCache) + new RemoveCacheJob(c, event).schedule(); } } diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java index 7c941f541a8..f1e6442e637 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java @@ -17,8 +17,8 @@ import org.eclipse.cdt.core.browser.IWorkingCopyProvider; import org.eclipse.cdt.core.dom.CDOM; import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.parser.CodeReader; -import org.eclipse.cdt.core.parser.EmptyCodeReaderCache; import org.eclipse.cdt.core.parser.ICodeReaderCache; +import org.eclipse.cdt.internal.core.dom.parser.EmptyCodeReaderCache; import org.eclipse.cdt.internal.core.parser.ast.EmptyIterator; /** |