From 01236146d13d0d38d6b38286124e93c63fddf4e5 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 5 Feb 2017 15:13:07 -0800 Subject: [PATCH] Removed unused code. Change-Id: I1afd20c0468cdd8347e3ee8fa3fd3c21fc1d216f --- .../dom/WorkingCopyCodeReaderFactory.java | 14 -- .../ui/preferences/CParserPreferencePage.java | 178 ------------------ .../cdt/ui/dialogs/CacheSizeBlock.java | 22 --- 3 files changed, 214 deletions(-) delete mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java index 1620597a46d..e9e8dd35e20 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/WorkingCopyCodeReaderFactory.java @@ -12,15 +12,12 @@ package org.eclipse.cdt.internal.core.dom; import org.eclipse.cdt.core.dom.CDOM; import org.eclipse.cdt.core.model.IWorkingCopyProvider; -import org.eclipse.cdt.core.parser.CodeReader; -import org.eclipse.cdt.core.parser.IScanner; /** * @author jcamelon */ @Deprecated public class WorkingCopyCodeReaderFactory extends PartialWorkingCopyCodeReaderFactory { - /** * @param provider */ @@ -28,19 +25,8 @@ public class WorkingCopyCodeReaderFactory extends PartialWorkingCopyCodeReaderFa super(provider, heuristics); } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#getUniqueIdentifier() - */ @Override public int getUniqueIdentifier() { return CDOM.PARSE_WORKING_COPY_WHENEVER_POSSIBLE; } - - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String) - */ - public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) { - return checkWorkingCopyThenCache(path); - } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java deleted file mode 100644 index b9b0c303c4e..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java +++ /dev/null @@ -1,178 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * Markus Schorn (Wind River Systems) - *******************************************************************************/ -package org.eclipse.cdt.internal.ui.preferences; - -import java.util.ArrayList; - -import org.eclipse.core.runtime.Preferences; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.dom.CDOM; -import org.eclipse.cdt.core.parser.CodeReaderCache; -import org.eclipse.cdt.core.parser.ICodeReaderCache; -import org.eclipse.cdt.ui.CUIPlugin; - -import org.eclipse.cdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey; - -/** - * @author dsteffle - * @deprecated the one preference found on the page was moved to the - * indexer preference page. - */ -@Deprecated -public class CParserPreferencePage extends PreferencePage implements - IWorkbenchPreferencePage { - - protected OverlayPreferenceStore fOverlayStore; - private Text bufferTextControl; - - public CParserPreferencePage(){ - setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); - fOverlayStore = createOverlayStore(); - } - - private OverlayPreferenceStore createOverlayStore() { - ArrayList overlayKeys = new ArrayList(); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, CodeReaderCache.CODE_READER_BUFFER)); - - OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()]; - overlayKeys.toArray(keys); - return new OverlayPreferenceStore(getPreferenceStore(), keys); - } - - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) - */ - @Override - protected Control createContents(Composite parent) { - fOverlayStore.load(); - fOverlayStore.start(); - - initializeDialogUnits(parent); - - Composite result= new Composite(parent, SWT.NONE); - GridLayout layout= new GridLayout(); - layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); - layout.marginWidth= 0; - layout.verticalSpacing= convertVerticalDLUsToPixels(10); - layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); - result.setLayout(layout); - - Group bufferGroup= new Group(result, SWT.NONE); - bufferGroup.setLayout(new GridLayout()); - bufferGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - bufferGroup.setText(PreferencesMessages.CBufferPreferences_CodeReaderBuffer_CodeReaderBufferGroup); - - bufferTextControl = (Text) addTextField( bufferGroup, PreferencesMessages.CBufferPreferences_CodeReaderBuffer_Size,6,0); - - initialize(); - - return result; - - } - - private void initialize(){ - bufferTextControl.setText(fOverlayStore.getString(CodeReaderCache.CODE_READER_BUFFER)); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ - @Override - public void init(IWorkbench workbench) { - // TODO Auto-generated method stub - } - - private Control addTextField(Composite composite, String label, int textLimit, int indentation) { - - Label labelControl = new Label(composite, SWT.NONE); - labelControl.setText(label); - GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalIndent = indentation; - labelControl.setLayoutData(gd); - - Text textControl = new Text(composite, SWT.BORDER | SWT.SINGLE); - gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.widthHint = convertWidthInCharsToPixels(textLimit + 1); - textControl.setLayoutData(gd); - textControl.setTextLimit(textLimit); - - return textControl; - } - - /* - * @see IPreferencePage#performOk() - */ - @Override - public boolean performOk() { - Preferences prefs = CCorePlugin.getDefault().getPluginPreferences(); - - String bufferSize = bufferTextControl.getText(); - fOverlayStore.setValue(CodeReaderCache.CODE_READER_BUFFER, bufferSize); - prefs.setValue(CodeReaderCache.CODE_READER_BUFFER, bufferSize); - - ICodeReaderCache cache = CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_SAVED_RESOURCES).getCodeReaderCache(); - if (cache instanceof CodeReaderCache) { - try { - // Check the string number - int size = Integer.parseInt(bufferSize); - if (size >= 0) { - ((CodeReaderCache)cache).setCacheSize(size); - } else { - ((CodeReaderCache)cache).setCacheSize(CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - prefs.setValue(CodeReaderCache.CODE_READER_BUFFER, CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - fOverlayStore.setValue(CodeReaderCache.CODE_READER_BUFFER, CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - } - } catch (NumberFormatException ex){ - ((CodeReaderCache)cache).setCacheSize(CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - prefs.setValue(CodeReaderCache.CODE_READER_BUFFER, CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - fOverlayStore.setValue(CodeReaderCache.CODE_READER_BUFFER, CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB); - } - } - - fOverlayStore.propagate(); - CCorePlugin.getDefault().savePluginPreferences(); - - return true; - } - - /** - * @param store - */ - public static void initDefaults(IPreferenceStore store) { - store.setDefault(CodeReaderCache.CODE_READER_BUFFER,CodeReaderCache.DEFAULT_CACHE_SIZE_IN_MB_STRING); - } - - /* - * @see PreferencePage#performDefaults() - */ - @Override - protected void performDefaults() { - fOverlayStore.loadDefaults(); - initialize(); - super.performDefaults(); - } -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java index c0ac2ad172b..a43954ef0cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CacheSizeBlock.java @@ -28,9 +28,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.cdt.core.CCorePreferenceConstants; -import org.eclipse.cdt.core.dom.CDOM; -import org.eclipse.cdt.core.parser.CodeReaderCache; -import org.eclipse.cdt.core.parser.ICodeReaderCache; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.ui.controls.ControlFactory; @@ -97,14 +94,6 @@ public class CacheSizeBlock extends AbstractCOptionPage { LayoutUtil.setHorizontalGrabbing(control, false); ControlFactory.createLabel(cacheComp, DialogsMessages.Megabyte); - Label codeReaderLabel= ControlFactory.createLabel(cacheComp, DialogsMessages.CacheSizeBlock_headerFileCache); - fCodeReaderLimit= new IntegerFieldEditor(CodeReaderCache.CODE_READER_BUFFER, DialogsMessages.CacheSizeBlock_absoluteLimit, cacheComp, 4); - fCodeReaderLimit.setValidRange(1, 10000); - control = fCodeReaderLimit.getTextControl(cacheComp); - LayoutUtil.setWidthHint(control, pixelConverter.convertWidthInCharsToPixels(10)); - LayoutUtil.setHorizontalGrabbing(control, false); - ControlFactory.createLabel(cacheComp, DialogsMessages.Megabyte); - gl= (GridLayout) cacheComp.getLayout(); gl.numColumns= 3; gl.makeColumnsEqualWidth= false; @@ -114,11 +103,6 @@ public class CacheSizeBlock extends AbstractCOptionPage { gd= (GridData) dbCacheLabel.getLayoutData(); gd.horizontalSpan= 3; - int vindent= pixelConverter.convertHeightInCharsToPixels(1) / 2; - gd= (GridData) codeReaderLabel.getLayoutData(); - gd.verticalIndent= vindent; - gd.horizontalSpan= 3; - int hindent= pixelConverter.convertWidthInCharsToPixels(2); gd= new GridData(); gd.horizontalAlignment= GridData.FILL; @@ -158,12 +142,6 @@ public class CacheSizeBlock extends AbstractCOptionPage { fDBLimitPct.store(); fDBAbsoluteLimit.store(); fCodeReaderLimit.store(); - - // code reader cache does not listen for pref-changes, help out: - ICodeReaderCache cache = CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_SAVED_RESOURCES).getCodeReaderCache(); - if (cache instanceof CodeReaderCache) { - ((CodeReaderCache) cache).setCacheSize(fCodeReaderLimit.getIntValue()); - } } @Override