diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java index 6ca46bb190f..90a79bd504e 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java @@ -45,7 +45,6 @@ public class CodanRunner { /** Do not instantiate. All methods are static */ private CodanRunner() {} - /** * Runs all checkers that support "run as you type" mode. * diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java index a90b2509135..7f4cb91497d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelCache.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.core.model; - - import java.util.HashMap; import java.util.Map; @@ -19,23 +17,22 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.IOpenable; import org.eclipse.cdt.internal.core.util.OverflowingLRUCache; - /** * The cache of C elements to their respective info. - * + * * This class is similar to the JDT CModelCache class. */ public class CModelCache { - public static final int PROJ_CACHE_SIZE = 50; - public static final int FOLDER_CACHE_SIZE = 500; + public static final int PROJ_CACHE_SIZE = 50; + public static final int FOLDER_CACHE_SIZE = 500; public static final int FILE_CACHE_SIZE = 2000; public static final int CHILDREN_CACHE_SIZE = FILE_CACHE_SIZE * 20; - + /** * Cache of open projects and roots. */ protected Map projectAndRootCache; - + /** * Cache of open containers */ @@ -50,62 +47,62 @@ public class CModelCache { * Cache of children of C elements */ protected Map childrenCache; - -public CModelCache() { - this.projectAndRootCache = new HashMap(PROJ_CACHE_SIZE); - this.folderCache = new HashMap(FOLDER_CACHE_SIZE); - this.fileCache = new ElementCache(FILE_CACHE_SIZE); - this.childrenCache = new HashMap(CHILDREN_CACHE_SIZE); // average 20 children per openable -} -public double openableFillingRatio() { - return this.fileCache.fillingRatio(); -} - -/** - * Returns the info for the element. - */ -public Object getInfo(ICElement element) { - switch (element.getElementType()) { + public CModelCache() { + this.projectAndRootCache = new HashMap(PROJ_CACHE_SIZE); + this.folderCache = new HashMap(FOLDER_CACHE_SIZE); + this.fileCache = new ElementCache(FILE_CACHE_SIZE); + this.childrenCache = new HashMap(CHILDREN_CACHE_SIZE); // average 20 children per openable + } + + public double openableFillingRatio() { + return this.fileCache.fillingRatio(); + } + + /** + * Returns the info for the element. + */ + public Object getInfo(ICElement element) { + switch (element.getElementType()) { case ICElement.C_MODEL: case ICElement.C_PROJECT: return this.projectAndRootCache.get(element); case ICElement.C_CCONTAINER: return this.folderCache.get(element); case ICElement.C_ARCHIVE: - case ICElement.C_BINARY: + case ICElement.C_BINARY: case ICElement.C_UNIT: return this.fileCache.get(element); default: return this.childrenCache.get(element); + } } -} -/** - * Returns the info for this element without - * disturbing the cache ordering. - */ -protected Object peekAtInfo(ICElement element) { - switch (element.getElementType()) { + /** + * Returns the info for this element without + * disturbing the cache ordering. + */ + protected Object peekAtInfo(ICElement element) { + switch (element.getElementType()) { case ICElement.C_MODEL: case ICElement.C_PROJECT: return this.projectAndRootCache.get(element); case ICElement.C_CCONTAINER: return this.folderCache.get(element); case ICElement.C_ARCHIVE: - case ICElement.C_BINARY: + case ICElement.C_BINARY: case ICElement.C_UNIT: return this.fileCache.peek((IOpenable) element); default: return this.childrenCache.get(element); + } } -} -/** - * Remember the info for the element. - */ -protected void putInfo(ICElement element, Object info) { - switch (element.getElementType()) { + /** + * Remember the info for the element. + */ + protected void putInfo(ICElement element, Object info) { + switch (element.getElementType()) { case ICElement.C_MODEL: case ICElement.C_PROJECT: this.projectAndRootCache.put(element, info); @@ -114,19 +111,20 @@ protected void putInfo(ICElement element, Object info) { this.folderCache.put(element, info); break; case ICElement.C_ARCHIVE: - case ICElement.C_BINARY: + case ICElement.C_BINARY: case ICElement.C_UNIT: this.fileCache.put((IOpenable)element, info); break; default: this.childrenCache.put(element, info); + } } -} -/** - * Removes the info of the element from the cache. - */ -protected void removeInfo(ICElement element) { - switch (element.getElementType()) { + + /** + * Removes the info of the element from the cache. + */ + protected void removeInfo(ICElement element) { + switch (element.getElementType()) { case ICElement.C_MODEL: case ICElement.C_PROJECT: this.projectAndRootCache.remove(element); @@ -135,13 +133,12 @@ protected void removeInfo(ICElement element) { this.folderCache.remove(element); break; case ICElement.C_ARCHIVE: - case ICElement.C_BINARY: + case ICElement.C_BINARY: case ICElement.C_UNIT: this.fileCache.remove((IOpenable)element); break; default: this.childrenCache.remove(element); + } } } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java index b3f300fa717..095b6460fbd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java @@ -32,9 +32,7 @@ import org.eclipse.cdt.ui.IWorkingCopyManager; import org.eclipse.cdt.internal.core.dom.parser.ASTTranslationUnit; - public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension { - private ITextEditor fEditor; private IWorkingCopyManager fManager; private IProgressMonitor fProgressMonitor; @@ -46,32 +44,20 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS fManager= CUIPlugin.getDefault().getWorkingCopyManager(); } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument) - */ @Override public void setDocument(IDocument document) { } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion) - */ @Override public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { // only called for incremental reconciler } - /* - * @see IReconcilingStrategyExtension#setProgressMonitor(IProgressMonitor) - */ @Override public void setProgressMonitor(IProgressMonitor monitor) { fProgressMonitor= monitor; } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion) - */ @Override public void reconcile(IRegion region) { reconcile(false); @@ -91,10 +77,11 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS forced= workingCopy.isConsistent(); ast= workingCopy.reconcile(computeAST, true, fProgressMonitor); } - } catch (OperationCanceledException oce) { + } catch (OperationCanceledException e) { // document was modified while parsing } catch (CModelException e) { - IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ + IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, + "Error in CDT UI during reconcile", e); //$NON-NLS-1$ CUIPlugin.log(status); } finally { if (computeAST) { @@ -117,8 +104,9 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS if (canceled) { aboutToBeReconciled(); } - } catch(Exception e) { - IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, "Error in CDT UI during reconcile", e); //$NON-NLS-1$ + } catch (Exception e) { + IStatus status= new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, IStatus.OK, + "Error in CDT UI during reconcile", e); //$NON-NLS-1$ CUIPlugin.log(status); } finally { if (index != null) { @@ -129,9 +117,6 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS } } - /* - * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile() - */ @Override public void initialReconcile() { reconcile(true); @@ -143,5 +128,4 @@ public class CReconcilingStrategy implements IReconcilingStrategy, IReconcilingS ((ICReconcilingListener)fEditor).aboutToBeReconciled(); } } - }