From 215a710dc74742f9bf2316b5b4fe492f13e26ebb Mon Sep 17 00:00:00 2001 From: David Inglis Date: Fri, 2 Apr 2004 19:02:25 +0000 Subject: [PATCH] use core preference settings --- .../cdt/make/internal/ui/MakeProjectOptionBlock.java | 2 +- .../ui/preferences/NewMakeProjectPreferencePage.java | 2 +- .../cdt/make/internal/ui/properties/MakePropertyPage.java | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java index 9f28412db7b..f00f7b94c42 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java @@ -25,7 +25,7 @@ public class MakeProjectOptionBlock extends TabFolderOptionBlock { protected void addTabs() { addTab(new SettingsBlock(MakeCorePlugin.getDefault().getPluginPreferences(), MakeBuilder.BUILDER_ID)); addTab(new ErrorParserBlock(MakeCorePlugin.getDefault().getPluginPreferences())); - addTab(new BinaryParserBlock(MakeCorePlugin.getDefault().getPluginPreferences())); + addTab(new BinaryParserBlock()); addTab(new BuildPathInfoBlock()); } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java index 629168e8e7a..70fc162926f 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java @@ -92,7 +92,7 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getPreferences() */ public Preferences getPreferences() { - return MakeUIPlugin.getDefault().getPluginPreferences(); + return MakeCorePlugin.getDefault().getPluginPreferences(); } } \ No newline at end of file diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java index 13231f1dcf3..d118e616c80 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.make.internal.ui.properties; import java.lang.reflect.InvocationTargetException; +import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.internal.ui.MakeProjectOptionBlock; import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.ui.dialogs.ICOptionContainer; @@ -126,11 +127,8 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer return super.isValid(); } - /* (non-Javadoc) - * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getPreferences() - */ public Preferences getPreferences() { - return null; + return MakeCorePlugin.getDefault().getPluginPreferences(); } }