From 816e6ec92bafd6701df0bafa3f730ccb13aaba09 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 5 Apr 2007 08:20:06 +0000
Subject: [PATCH] Rollback attribute renaming for cPropertyTab extension point

---
 .../plugin.xml                                | 66 +++++++++----------
 .../schema/cPropertyTab.exsd                  |  2 +-
 .../eclipse/cdt/ui/newui/AbstractPage.java    |  2 +-
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 5b6e2fb547f..cdab8712028 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -257,39 +257,39 @@
            icon="icons/elcl16/discovery.gif"
            name="%Discovery.options"
            weight="005"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"
            weight="004"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
            name="(Single) CDT Vars (macros)"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_Variables"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.ToolChainEditTab"
            name="(Single) Tool chain edit"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ToolChain"/>
 
 <!-- exported from CORE -->           
      <tab
@@ -297,145 +297,141 @@
            icon="icons/obj16/hfolder_obj.gif"
            name="%Includes"
            weight="001"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="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"           
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="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"           
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"/>
      <tab
            class="org.eclipse.cdt.ui.newui.StructureTreeTab"
            icon="icons/obj16/hierarchy.gif"
            name="%Data.hierarchy"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_BuildSettings"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.properties.CPropertyVarsTab"
            name="(Single) CDT Vars (macros)"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"/>
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"
+           parent="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"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
-
+           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTProject"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.preferences.PreferredToolchainsTab"
            name="%Preferred.toolchains"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
+           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
      <tab
            class="org.eclipse.cdt.managedbuilder.ui.preferences.WizardDefaultsTab"
            name="%Wizard.defaults"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
-
+           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
      <tab
            class="org.eclipse.cdt.ui.newui.PropertyPageDefsTab"
            name="%PropertyPage.defaults"
-           parentId="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"/>
-
-
+           parent="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"/>
   </extension>   
 
       <extension
diff --git a/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd b/core/org.eclipse.cdt.ui/schema/cPropertyTab.exsd
index 1dee509acea..fa0fbf67de4 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="parentId" type="string" use="required">
+         <attribute name="parent" type="string" use="required">
             <annotation>
                <documentation>
                   Class name for container page.
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 aeb8cfb33d6..bc5eb4784c9 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 = "parentId"; //$NON-NLS-1$
+	public static final String PARENT_NAME = "parent"; //$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$