From af1e9d09890752f60b767f2616b7c6608a32deac Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 4 Apr 2007 10:36:55 +0000
Subject: [PATCH] Property pages adjust

---
 .../plugin.properties                         |   3 +
 .../plugin.xml                                | 101 ++++++++++--------
 .../ui/preferences}/PrefPage_Env.java         |   4 +-
 .../preferences}/PrefPage_PropertyPage.java   |   3 +-
 .../ui/preferences}/PrefPage_Vars.java        |   4 +-
 .../ui/properties}/Page_BuildSettings.java    |   4 +-
 .../ui/properties}/Page_ExpPathAndSymb.java   |   4 +-
 .../ui/properties}/Page_Languages.java        |   4 +-
 .../ui/properties}/Page_PathAndSymb.java      |   4 +-
 .../ui/properties}/Page_Variables.java        |   4 +-
 core/org.eclipse.cdt.ui/plugin.properties     |   4 -
 core/org.eclipse.cdt.ui/plugin.xml            |  15 ---
 .../schema/cPropertyTab.exsd                  |   5 +-
 .../eclipse/cdt/ui/newui/AbstractPage.java    |   2 +-
 14 files changed, 85 insertions(+), 76 deletions(-)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences}/PrefPage_Env.java (84%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences}/PrefPage_PropertyPage.java (92%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences}/PrefPage_Vars.java (84%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties}/Page_BuildSettings.java (88%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties}/Page_ExpPathAndSymb.java (88%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties}/Page_Languages.java (86%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties}/Page_PathAndSymb.java (88%)
 rename {core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui => build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties}/Page_Variables.java (86%)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 3b82870e56f..d61e2b97578 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -25,6 +25,9 @@ MngOtherProp.name= Error/Binary Parsers
 MakeBuildPref.name=Makefile Project
 MngBuildPref.name=Managed Build
 NewCDTWizardPref.name=New CDT project wizard
+varsPrefName=CDT build variables
+envPrefName=Environment 
+propSettingsPrefName=Property Pages settings 
 
 #The Resource Property page
 MngResourceProp.name=C/C++ Build
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index e0711ec4a1e..5b6e2fb547f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -89,16 +89,29 @@
          point="org.eclipse.ui.preferencePages">
       <page
             name="%MakeBuildPref.name"
-            category="org.eclipse.cdt.managedbuilder.ui.preferences.WizardPreferences"
+            category="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
-            id="org.eclipse.cdt.managedbuilder.ui.preferences.BuildPreferences">
-      </page>
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
       <page
             name="%NewCDTWizardPref.name"
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
-            id="org.eclipse.cdt.managedbuilder.ui.preferences.WizardPreferences">
-      </page>
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
+      <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
+            name="%envPrefName"/>
+      <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
+            name="%varsPrefName"/>
+      <page
+            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
+            id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
+            name="%propSettingsPrefName"/>
    </extension>
    
    <!-- Action for Project Converter in context menu -->
@@ -244,39 +257,39 @@
            icon="icons/elcl16/discovery.gif"
            name="%Discovery.options"
            weight="005"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.ToolSettingsTab"
            icon="icons/elcl16/config-tool.gif"
            name="%Tool.settings"
            weight="001"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.BuildStepsTab"
            icon="icons/obj16/steps.gif"
            name="%Build.steps"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
            weight="002"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.ArtifactTab"
            icon="icons/obj16/artifact.gif"
            name="%Build.artifact"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
            weight="003"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.BuilderSettingsTab"
            icon="icons/obj16/build_settings.gif"
            name="%Builder.settings"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
            weight="004"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
            name="(Single) CDT Vars (macros)"
-           parent="org.eclipse.cdt.ui.newui.Page_Variables"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.ToolChainEditTab"
            name="(Single) Tool chain edit"
-           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
 
 <!-- exported from CORE -->           
      <tab
@@ -284,143 +297,143 @@
            icon="icons/obj16/hfolder_obj.gif"
            name="%Includes"
            weight="001"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
            tooltip="&quot;Includes list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.SymbolTab"
            icon="icons/obj16/define_obj.gif"
            name="%Symbols"
            weight="002"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
            tooltip="&quot;Macros list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.LibraryTab"
            icon="icons/obj16/lib_obj.gif"
            name="%Libraries"
            weight="003"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
            tooltip="&quot;Libraries list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.LibraryPathTab"
            icon="icons/obj16/opentype.gif"
            name="%Library.paths"
            weight="004"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.ui.newui.RefsTab"
            icon="icons/obj16/search_ref_obj.gif"
            name="%References"
            weight="010"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.ui.newui.CLocationSourceTab"
            icon="icons/obj16/fldr_obj.gif"
            name="%Source.location"
            weight="008"           
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CBuildLocationOutputTab"
            icon="icons/obj16/output_folder_obj.gif"
            name="%Output.location"
            weight="009"           
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.ui.newui.StructureTreeTab"
            icon="icons/obj16/hierarchy.gif"
            name="%Data.hierarchy"
-           parent="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
            weight="012"/>
      <tab
            class="org.eclipse.cdt.ui.newui.EnvironmentTab"
            icon="icons/obj16/environment.gif"
            name="%Environment"
            weight="005"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
      <tab
            class="org.eclipse.cdt.ui.newui.BinaryParsTab"
            icon="icons/obj16/bin_obj.gif"
            name="%Binary.parsers"
            weight="006"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ErrorParsTab"
            icon="icons/obj16/error_obj.gif"
            name="%Error.parsers"
            weight="007"
-           parent="org.eclipse.cdt.ui.newui.Page_BuildSettings"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
 
 	 <!-- Export settings page -->
 	      <tab
            class="org.eclipse.cdt.ui.newui.ExpIncludeTab"
            icon="icons/obj16/hfolder_obj.gif"
            name="%Includes"
-           parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
            tooltip="&quot;Includes list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpSymbolTab"
            icon="icons/obj16/define_obj.gif"
            name="%Symbols"
-           parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
            tooltip="&quot;Macros list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpLibraryTab"
            icon="icons/obj16/lib_obj.gif"
            name="%Libraries"
-           parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
            tooltip="&quot;Libraries list&quot;"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpLibraryPathTab"
            icon="icons/obj16/opentype.gif"
            name="%Library.paths"
-           parent="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"/>
 
      <!-- tabs for Preference pages -->      
      <tab
            class="org.eclipse.cdt.ui.newui.EnvironmentTab"
            icon="icons/obj16/environment.gif"
            name="(Single) Environment"
-           parent="org.eclipse.cdt.ui.newui.PrefPage_Env"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
            name="(Single) CDT Vars (macros)"
-           parent="org.eclipse.cdt.ui.newui.PrefPage_Vars"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"/>
      <tab
            class="org.eclipse.cdt.ui.newui.BinaryParsTab"
            name="%Binary.parsers"
            icon="icons/obj16/bin_obj.gif"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
            />
      <tab
            class="org.eclipse.cdt.ui.newui.ErrorParsTab"
            name="%Error.parsers"
            icon="icons/obj16/error_obj.gif"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
            />
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.DiscoveryTab"
            icon="icons/elcl16/discovery.gif"
            name="%Discovery.options"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
            />
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.BuilderSettingsTab"
            icon="icons/obj16/build_settings.gif"
            name="%Builder.settings"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
 
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.preferences.PreferredToolchainsTab"
            name="%Preferred.toolchains"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.preferences.WizardDefaultsTab"
            name="%Wizard.defaults"
-           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
 
      <tab
            class="org.eclipse.cdt.ui.newui.PropertyPageDefsTab"
            name="%PropertyPage.defaults"
-           parent="org.eclipse.cdt.ui.newui.PrefPage_PropertyPage"/>
+           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"/>
 
 
   </extension>   
@@ -495,8 +508,8 @@
      <extension
          point="org.eclipse.ui.propertyPages">
         <page
-            class="org.eclipse.cdt.ui.newui.Page_Variables"
-            id="org.eclipse.ui.propertypages.project.ref10"
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"
             name="%CDTVariablesProperty.name"
             >
          <filter
@@ -512,8 +525,8 @@
       </page>
       
       <page
-            class="org.eclipse.cdt.ui.newui.Page_PathAndSymb"
-            id="org.eclipse.ui.propertypages.project.ref12"
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
             name="%CDTPathSymbolsProperty.name"
             >
          <filter
@@ -543,7 +556,7 @@
       
       <!--page
             class="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
-            id="org.eclipse.ui.propertypages.project.ref16"
+            id="org.eclipse.cdt.ui.newui.Page_ExpPathAndSymb"
             name="%CDTExpPathSymbolsProperty.name"
             >
          <filter
@@ -559,8 +572,8 @@
       </page-->
 
       <page
-            class="org.eclipse.cdt.ui.newui.Page_BuildSettings"
-            id="org.eclipse.ui.propertypages.project.ref13"
+            class="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
             name="%CDTBuildProperty.name"
             >
          <filter
@@ -588,7 +601,7 @@
       </page>
       <page
             class="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
-            id="org.eclipse.ui.propertypages.project.ref14"
+            id="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"
             name="%CDTToolchainProperty.name"
             >
          <filter
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Env.java
similarity index 84%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Env.java
index b4b1e7fddda..a7feb0a2419 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Env.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Env.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.preferences;
+
+import org.eclipse.cdt.ui.newui.PrefPage_Abstract;
 
 public class PrefPage_Env extends PrefPage_Abstract {
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_PropertyPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
similarity index 92%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_PropertyPage.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
index bf227b737bb..da86cd27c6e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_PropertyPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_PropertyPage.java
@@ -9,11 +9,12 @@
  * Intel Corporation - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.preferences;
 
 import org.eclipse.cdt.core.settings.model.ICResourceDescription;
 import org.eclipse.cdt.ui.newui.AbstractPrefPage;
 import org.eclipse.cdt.ui.newui.ICPropertyTab;
+import org.eclipse.cdt.ui.newui.UIMessages;
 
 public class PrefPage_PropertyPage extends AbstractPrefPage {
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Vars.java
similarity index 84%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Vars.java
index 5a4c7543877..ac106df0fb0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Vars.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PrefPage_Vars.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.preferences;
+
+import org.eclipse.cdt.ui.newui.PrefPage_Abstract;
 
 public class PrefPage_Vars extends PrefPage_Abstract {
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_BuildSettings.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_BuildSettings.java
similarity index 88%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_BuildSettings.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_BuildSettings.java
index 96f76b7103c..6beedb23022 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_BuildSettings.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_BuildSettings.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 
 /**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_ExpPathAndSymb.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java
similarity index 88%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_ExpPathAndSymb.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java
index 956f2f93c2a..579cee362ef 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_ExpPathAndSymb.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 
 /**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Languages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java
similarity index 86%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Languages.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java
index 27102c65182..7316178ceb1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Languages.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Languages.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 public class Page_Languages extends AbstractPage {
 	protected boolean isSingle() { return true; }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_PathAndSymb.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_PathAndSymb.java
similarity index 88%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_PathAndSymb.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_PathAndSymb.java
index 7da44a0baf3..3e72f1d16f9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_PathAndSymb.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_PathAndSymb.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 
 /**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Variables.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Variables.java
similarity index 86%
rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Variables.java
rename to build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Variables.java
index 0988f94e7f8..7c90b4aa1ba 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_Variables.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_Variables.java
@@ -8,7 +8,9 @@
  * Contributors:
  *     Intel Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.newui;
+package org.eclipse.cdt.managedbuilder.ui.properties;
+
+import org.eclipse.cdt.ui.newui.AbstractPage;
 
 
 public class Page_Variables extends AbstractPage {
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 30c85ab395a..ec7ec8e64f9 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -351,10 +351,6 @@ completionProposalComputer=Completion Proposal Computer
 # Indexer Preference Name
 indexerPrefName=Indexer
 
-varsPrefName=CDT build variables
-envPrefName=Environment 
-propSettingsPrefName=Property Pages settings 
-
 # indexer names
 CDTIndexer.domsourceindexer=Full C/C++ Indexer (complete parse)
 CDTIndexer.nullindexer=No Indexer (search based features will not work correctly)
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index f59dd7fbc13..6b333a5db28 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -685,21 +685,6 @@
             class="org.eclipse.cdt.internal.ui.preferences.IndexerPreferencePage"
             id="org.eclipse.cdt.ui.preferences.IndexerPreferencePage"
             name="%indexerPrefName"/>
-      <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
-            class="org.eclipse.cdt.ui.newui.PrefPage_Env"
-            id="org.eclipse.cdt.ui.preferences.EnvironmentPrefPage"
-            name="%envPrefName"/>
-      <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
-            class="org.eclipse.cdt.ui.newui.PrefPage_Vars"
-            id="org.eclipse.cdt.ui.preferences.VariablesPrefPage"
-            name="%varsPrefName"/>
-      <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
-            class="org.eclipse.cdt.ui.newui.PrefPage_PropertyPage"
-            id="org.eclipse.cdt.ui.preferences.PropertyPageSettings"
-            name="%propSettingsPrefName"/>
       <!--page
             name="%WorkInProgress.name"
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
diff --git a/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd b/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd
index 1b5f49f2fcc..1dee509acea 100644
--- a/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd
+++ b/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd
@@ -90,7 +90,7 @@ Ignored for single-tab pages.
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="parent" type="string" use="required">
+         <attribute name="parentId" type="string" use="required">
             <annotation>
                <documentation>
                   Class name for container page.
@@ -98,9 +98,6 @@ Usually pages are to be derived from
 org.eclipse.cdt.ui.newui.AbstractPage,
 but it is not obligatory.
                </documentation>
-               <appInfo>
-                  <meta.attribute kind="java"/>
-               </appInfo>
             </annotation>
          </attribute>
          <attribute name="tooltip" type="string">
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index bc5eb4784c9..aeb8cfb33d6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -113,7 +113,7 @@ implements
 	private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.cPropertyTab"; //$NON-NLS-1$
 	public static final String ELEMENT_NAME = "tab"; //$NON-NLS-1$
 	public static final String CLASS_NAME = "class"; //$NON-NLS-1$
-	public static final String PARENT_NAME = "parent"; //$NON-NLS-1$
+	public static final String PARENT_NAME = "parentId"; //$NON-NLS-1$
 	public static final String IMAGE_NAME = "icon"; //$NON-NLS-1$
 	public static final String TIP_NAME = "tooltip"; //$NON-NLS-1$
 	public static final String TEXT_NAME = "name"; //$NON-NLS-1$