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

fixed preference saving bug with bin parser page

Browse source
This commit is contained in:
David Inglis 2003-10-01 14:15:13 +00:00
parent 46a9e7fd6f
commit fc7419740e
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2003-10-01 David Inglis
- Fixed bug with binary parser page not saving change to preference.
* src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
2003-09-30 Bogdan Gheorghe 2003-09-30 Bogdan Gheorghe
- Added F3 key binding for the Open Declarations Action - Added F3 key binding for the Open Declarations Action
- Bug 42047: Added Ctrl+H binding for the C++ Search Dialog - Bug 42047: Added Ctrl+H binding for the C++ Search Dialog

24
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java
View file

@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionEvent;
@ -107,25 +108,27 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
if (monitor == null) { if (monitor == null) {
monitor = new NullProgressMonitor(); monitor = new NullProgressMonitor();
} }
monitor.beginTask("Parsers", 1); monitor.beginTask("Setting Binary Parser...", 2);
if (getContainer().getProject() != null) {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(getContainer().getProject());
String selected = comboBox.getText(); String selected = comboBox.getText();
if (selected != null) { if (selected != null) {
if (initial == null || !selected.equals(initial)) { if (initial == null || !selected.equals(initial)) {
if (getContainer().getProject() != null) {
ICDescriptor desc = CCorePlugin.getDefault().getCProjectDescription(getContainer().getProject());
desc.remove(CCorePlugin.BINARY_PARSER_UNIQ_ID); desc.remove(CCorePlugin.BINARY_PARSER_UNIQ_ID);
desc.create(CCorePlugin.BINARY_PARSER_UNIQ_ID, (String) idMap.get(selected)); desc.create(CCorePlugin.BINARY_PARSER_UNIQ_ID, (String) idMap.get(selected));
CCorePlugin.getDefault().getCoreModel().resetBinaryParser(getContainer().getProject()); CCorePlugin.getDefault().getCoreModel().resetBinaryParser(getContainer().getProject());
} else {
fPrefs.setValue(CCorePlugin.PREF_BINARY_PARSER, (String) idMap.get(selected));
}
initial = selected; initial = selected;
} }
} }
} else { monitor.worked(1);
fPrefs.setDefault(CCorePlugin.PREF_BINARY_PARSER, (String) idMap.get(initial));
}
// Give a chance to the contributions to save. // Give a chance to the contributions to save.
// We have to do it last to make sure the parser id is save // We have to do it last to make sure the parser id is save
// in .cdtproject // in .cdtproject
super.performApply(monitor); super.performApply(new SubProgressMonitor(monitor, 1));
monitor.done();
} }
public void setContainer(ICOptionContainer container) { public void setContainer(ICOptionContainer container) {
@ -168,12 +171,13 @@ public class BinaryParserBlock extends AbstractBinaryParserPage {
} else { } else {
id = fPrefs.getDefaultString(CCorePlugin.PREF_BINARY_PARSER); id = fPrefs.getDefaultString(CCorePlugin.PREF_BINARY_PARSER);
} }
String selected;
if (id == null || id.length() == 0) { if (id == null || id.length() == 0) {
initial = point.getExtension(CCorePlugin.DEFAULT_BINARY_PARSER_UNIQ_ID).getLabel(); selected = point.getExtension(CCorePlugin.DEFAULT_BINARY_PARSER_UNIQ_ID).getLabel();
} else { } else {
initial = point.getExtension(id).getLabel(); selected = point.getExtension(id).getLabel();
} }
comboBox.setText(initial); comboBox.setText(selected);
// Give a change to the UI contributors to react. // Give a change to the UI contributors to react.
// But do it last after the comboBox is set. // But do it last after the comboBox is set.
handleBinaryParserChanged(); handleBinaryParserChanged();