From 72ac8f6242061cc05ef21636d86716db4d9c9943 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Mon, 22 Mar 2010 01:48:19 +0000
Subject: [PATCH] [306658] - Property page for codan shows up on non C projects
 and should be under general C/C++ category

---
 .../META-INF/MANIFEST.MF                       |  4 ++--
 .../OSGI-INF/l10n/bundle.properties            |  7 +++++++
 .../org.eclipse.cdt.codan.ui/build.properties  |  3 ++-
 codan/org.eclipse.cdt.codan.ui/plugin.xml      | 18 +++++++++---------
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 codan/org.eclipse.cdt.codan.ui/OSGI-INF/l10n/bundle.properties

diff --git a/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
index ffdbddbd1c5..5682f9d89e0 100644
--- a/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Code Analyzers Framework
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.cdt.codan.ui; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.codan.internal.ui.CodanUIActivator
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/codan/org.eclipse.cdt.codan.ui/OSGI-INF/l10n/bundle.properties b/codan/org.eclipse.cdt.codan.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..f415c260f38
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,7 @@
+#Properties file for org.eclipse.cdt.codan.ui
+Bundle-Vendor = CDT
+Bundle-Name = Code Analysis UI
+CodeAnalysisAction.label = Run Code Analysis
+CodeAnalysisProperties.name = Code Analysis
+CodeAnalysisPreferences.name = Code Analysis 
+CodeAnalysisPreferencesBuild.name = Build
\ No newline at end of file
diff --git a/codan/org.eclipse.cdt.codan.ui/build.properties b/codan/org.eclipse.cdt.codan.ui/build.properties
index 2b0d95b6b02..81723ae5646 100644
--- a/codan/org.eclipse.cdt.codan.ui/build.properties
+++ b/codan/org.eclipse.cdt.codan.ui/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties
diff --git a/codan/org.eclipse.cdt.codan.ui/plugin.xml b/codan/org.eclipse.cdt.codan.ui/plugin.xml
index fc386277def..21879e1ad8d 100644
--- a/codan/org.eclipse.cdt.codan.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui/plugin.xml
@@ -11,7 +11,7 @@
             nameFilter="*"
             id="org.eclipse.cdt.codan.ui.runaction">
          <action
-               label="Run Code Analysis"
+               label="%CodeAnalysisAction.label"
                class="org.eclipse.cdt.codan.internal.ui.actions.RunCodeAnalysis"
                menubarPath="additions"
                enablesFor="+"
@@ -26,27 +26,27 @@
                    category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
                class="org.eclipse.cdt.codan.internal.ui.preferences.CodanPreferencePage"
                id="org.eclipse.cdt.codan.ui.preferences.CodanPreferencePage"
-               name="Code Analysis">
+               name="%CodeAnalysisProperties.name">
       </page>
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            name="C/C++ Code Analysis "
-
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             class="org.eclipse.cdt.codan.internal.ui.preferences.CodanPreferencePage"
-            id="org.eclipse.cdt.codan.ui.properties.codanProblemsPropertyPage">
+            id="org.eclipse.cdt.codan.ui.properties.codanProblemsPropertyPage"
+            name="%CodeAnalysisPreferences.name">
          <enabledWhen>
-            <instanceof
-                  value="org.eclipse.core.resources.IProject">
-            </instanceof>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
+		     </adapt>         
          </enabledWhen>
       </page>
       <page
             category="org.eclipse.cdt.codan.ui.properties.codanProblemsPropertyPage"
             class="org.eclipse.cdt.codan.internal.ui.preferences.BuildPropertyPage"
             id="org.eclipse.cdt.codan.ui.properties.buildPropertyPage"
-            name="Build">
+            name="%CodeAnalysisPreferencesBuild.name">
         <enabledWhen>
             <instanceof
                   value="org.eclipse.core.resources.IProject">