Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDavid Inglis2004-09-08 11:05:09 -0400
committerDavid Inglis2004-09-08 11:05:09 -0400
commit75c897cf266abdd9c354a82c21c206b59f5f492d (patch)
tree56200e580a6151ae4b84e80b92022694074c3264 /build
parent0ad9d83903c7e924ff82320e8d1bb29722acb2cd (diff)
downloadorg.eclipse.cdt-75c897cf266abdd9c354a82c21c206b59f5f492d.tar.gz
org.eclipse.cdt-75c897cf266abdd9c354a82c21c206b59f5f492d.tar.xz
org.eclipse.cdt-75c897cf266abdd9c354a82c21c206b59f5f492d.zip
group make preferences under one "Make" entry.
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.ui/plugin.properties2
-rw-r--r--build/org.eclipse.cdt.make.ui/plugin.xml16
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java4
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakePreferencePage.java (renamed from build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakeTargetsPreferencePage.java)4
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java4
5 files changed, 15 insertions, 15 deletions
diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties
index 6a748a7f8a6..b867bd2c3d4 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.properties
+++ b/build/org.eclipse.cdt.make.ui/plugin.properties
@@ -33,7 +33,7 @@ CommandTargetCreate.name=Create Make Target
CommandTargetCreate.description=Create a new make build target for the selected container.
PreferenceMakeProject.name=New Make Projects
-PreferenceMakeTargets.name=Make Targets
+PreferenceMake.name=Make
PreferenceMakefileEditor.name=Makefile Editor
PreferenceMakefileSettings.name= Settings
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 0b46097ce07..4270089aba2 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -291,20 +291,20 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- name="%PreferenceMakeProject.name"
+ name="%PreferenceMake.name"
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
- class="org.eclipse.cdt.make.internal.ui.preferences.NewMakeProjectPreferencePage"
+ class="org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
</page>
<page
- name="%PreferenceMakeTargets.name"
- category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
- class="org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage"
- id="org.eclipse.cdt.make.ui.preferences.MakeTargetsPreferencePage">
+ name="%PreferenceMakeProject.name"
+ category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
+ class="org.eclipse.cdt.make.internal.ui.preferences.NewMakeProjectPreferencePage"
+ id="org.eclipse.cdt.make.ui.preferences.MakeProjectPreferencePage">
</page>
<page
name="%PreferenceMakefileEditor.name"
- category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+ category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferencePage"
id="org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage">
</page>
@@ -312,7 +312,7 @@
name="%PreferenceMakefileSettings.name"
category="org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage"
class="org.eclipse.cdt.make.internal.ui.preferences.MakefileSettingsPreferencePage"
- id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
+ id="org.eclipse.cdt.make.ui.preferences.MakefileSettingPreferencePage">
</page>
</extension>
<extension
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java
index 116d7eef562..d4f3225d56b 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java
@@ -8,7 +8,7 @@
******************************************************************************/
package org.eclipse.cdt.make.internal.ui;
-import org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage;
+import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage;
import org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferenceConstants;
import org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferencePage;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
@@ -20,7 +20,7 @@ public class MakeUIPreferenceInitializer extends AbstractPreferenceInitializer {
* @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
*/
public void initializeDefaultPreferences() {
- MakeTargetsPreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
+ MakePreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
MakefileEditorPreferenceConstants.initializeDefaultValues(MakeUIPlugin.getDefault().getPreferenceStore());
MakefileEditorPreferencePage.initDefaults(MakeUIPlugin.getDefault().getPreferenceStore());
}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakeTargetsPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakePreferencePage.java
index 5dcbbb400bb..99ab47aec58 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakeTargetsPreferencePage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakePreferencePage.java
@@ -18,12 +18,12 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-public class MakeTargetsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+public class MakePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
private static final String PREF_BUILD_TARGET_IN_BACKGROUND = "MakeTargetPrefs.buildTargetInBackground"; //$NON-NLS-1$
private static final String TARGET_BUILDS_IN_BACKGROUND = "MakeTargetPreferencePage.buildTargetInBackground.label"; //$NON-NLS-1$
- public MakeTargetsPreferencePage() {
+ public MakePreferencePage() {
super(GRID);
setPreferenceStore(MakeUIPlugin.getDefault().getPreferenceStore());
}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java
index 4a1a0ff1f52..0717911f3fd 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java
@@ -16,7 +16,7 @@ import java.util.List;
import org.eclipse.cdt.make.core.IMakeTarget;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
-import org.eclipse.cdt.make.internal.ui.preferences.MakeTargetsPreferencePage;
+import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException;
@@ -107,7 +107,7 @@ public class TargetBuild {
};
targetJob.schedule();
- if (!MakeTargetsPreferencePage.isBuildTargetInBackground()) {
+ if (!MakePreferencePage.isBuildTargetInBackground()) {
runWithProgressDialog(shell, targetJob);
}
}

Back to the top