mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Reverting unintentional commit.

Browse source
This commit is contained in:
Markus Schorn 2007-04-18 14:47:16 +00:00
parent 874797e0ce
commit 3a6af038ff
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java
View file

@ -27,30 +27,25 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.cdt.ui.dialogs.CacheSizeBlock; import org.eclipse.cdt.ui.dialogs.CacheSizeBlock;
import org.eclipse.cdt.ui.dialogs.ICOptionContainer; import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
import org.eclipse.cdt.ui.dialogs.IndexerBlock; import org.eclipse.cdt.ui.dialogs.IndexerBlock;
import org.eclipse.cdt.ui.dialogs.IndexerStrategyBlock;
public class IndexerPreferencePage extends PreferencePage implements public class IndexerPreferencePage extends PreferencePage implements
IWorkbenchPreferencePage, ICOptionContainer { IWorkbenchPreferencePage, ICOptionContainer {
private IndexerBlock fOptionBlock; private IndexerBlock fOptionBlock;
private CacheSizeBlock fCacheBlock; private CacheSizeBlock fCacheBlock;
private IndexerStrategyBlock fStrategyBlock;
public IndexerPreferencePage(){ public IndexerPreferencePage(){
fOptionBlock = new IndexerBlock(); fOptionBlock = new IndexerBlock();
fStrategyBlock= new IndexerStrategyBlock(this);
fCacheBlock= new CacheSizeBlock(this); fCacheBlock= new CacheSizeBlock(this);
} }
protected Control createContents(Composite parent) { protected Control createContents(Composite parent) {
GridLayout gl;
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(gl= new GridLayout()); composite.setLayout(new GridLayout());
composite.setLayoutData(new GridData()); GridData gd= new GridData();
gl.verticalSpacing= 0; composite.setLayoutData(gd);
fOptionBlock.createControl(composite); fOptionBlock.createControl(composite);
fStrategyBlock.createControl(composite);
fCacheBlock.createControl(composite); fCacheBlock.createControl(composite);
return composite; return composite;
@ -64,10 +59,6 @@ public class IndexerPreferencePage extends PreferencePage implements
setErrorMessage(fOptionBlock.getErrorMessage()); setErrorMessage(fOptionBlock.getErrorMessage());
setValid(false); setValid(false);
} }
else if (!fStrategyBlock.isValid()) {
setErrorMessage(fStrategyBlock.getErrorMessage());
setValid(false);
}
else if (!fCacheBlock.isValid()) { else if (!fCacheBlock.isValid()) {
setErrorMessage(fCacheBlock.getErrorMessage()); setErrorMessage(fCacheBlock.getErrorMessage());
setValid(false); setValid(false);
@ -89,7 +80,6 @@ public class IndexerPreferencePage extends PreferencePage implements
public boolean performOk() { public boolean performOk() {
try { try {
fOptionBlock.performApply(new NullProgressMonitor()); fOptionBlock.performApply(new NullProgressMonitor());
fStrategyBlock.performApply(new NullProgressMonitor());
fCacheBlock.performApply(new NullProgressMonitor()); fCacheBlock.performApply(new NullProgressMonitor());
} catch (CoreException e) {} } catch (CoreException e) {}
return true; return true;
@ -97,8 +87,6 @@ public class IndexerPreferencePage extends PreferencePage implements
public void performDefaults() { public void performDefaults() {
fOptionBlock.performDefaults(); fOptionBlock.performDefaults();
fStrategyBlock.performDefaults();
fCacheBlock.performDefaults(); fCacheBlock.performDefaults();
updateContainer();
} }
} }