From 14561b343f395932078b16a31bbb7acce5ad896a Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Thu, 26 Dec 2019 13:31:06 -0500
Subject: [PATCH] Bug 558638: Add nature user display names

Change-Id: I2cabb572ab2e4a1ad2c3890267628a0aa13e4211
---
 .../META-INF/MANIFEST.MF                           |  5 +++--
 build/org.eclipse.cdt.cmake.core/build.properties  |  3 ++-
 build/org.eclipse.cdt.cmake.core/plugin.properties | 14 ++++++++++++++
 build/org.eclipse.cdt.cmake.core/plugin.xml        |  3 ++-
 .../plugin.properties                              |  1 +
 .../org.eclipse.cdt.core.autotools.core/plugin.xml |  1 +
 build/org.eclipse.cdt.meson.core/plugin.properties |  3 ++-
 build/org.eclipse.cdt.meson.core/plugin.xml        |  1 +
 core/org.eclipse.cdt.core/plugin.xml               |  2 +-
 qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF    |  2 +-
 qt/org.eclipse.cdt.qt.core/plugin.properties       |  1 +
 qt/org.eclipse.cdt.qt.core/plugin.xml              |  1 +
 .../org.eclipse.cdt.arduino.core/plugin.properties |  1 +
 .../org.eclipse.cdt.arduino.core/plugin.xml        |  1 +
 14 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 build/org.eclipse.cdt.cmake.core/plugin.properties

diff --git a/build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
index 0b2c2f5dad8..98ad8946326 100644
--- a/build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT CMake Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.cmake.core;singleton:=true
 Bundle-Version: 1.2.300.qualifier
 Bundle-Activator: org.eclipse.cdt.cmake.core.internal.Activator
-Bundle-Vendor: Eclipse CDT
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.11.0",
  org.eclipse.debug.core;bundle-version="3.10.0",
@@ -17,3 +17,4 @@ Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.cmake.core,
  org.eclipse.cdt.cmake.core.internal;x-friends:="org.eclipse.cdt.cmake.ui"
 Automatic-Module-Name: org.eclipse.cdt.cmake.core
+Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.cmake.core/build.properties b/build/org.eclipse.cdt.cmake.core/build.properties
index 183351cbe19..b698ce671b0 100644
--- a/build/org.eclipse.cdt.cmake.core/build.properties
+++ b/build/org.eclipse.cdt.cmake.core/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.xml,\
                schema/,\
-               templates/
+               templates/,\
+               plugin.properties
 src.includes = about.html
diff --git a/build/org.eclipse.cdt.cmake.core/plugin.properties b/build/org.eclipse.cdt.cmake.core/plugin.properties
new file mode 100644
index 00000000000..7231a0e9a16
--- /dev/null
+++ b/build/org.eclipse.cdt.cmake.core/plugin.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2019 Kichwa Coders Canada Inc and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+pluginName=CDT CMake Core
+providerName=Eclipse CDT
+cmakenature.name=CMake Nature
+cmaketoolChainProvider.name=CMake ToolChain File Provider
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.cmake.core/plugin.xml b/build/org.eclipse.cdt.cmake.core/plugin.xml
index b907d39959a..c3c7ffc84e6 100644
--- a/build/org.eclipse.cdt.cmake.core/plugin.xml
+++ b/build/org.eclipse.cdt.cmake.core/plugin.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="toolChainProvider" name="CMake ToolChain File Provider" schema="schema/toolChainProvider.exsd"/>
+   <extension-point id="toolChainProvider" name="%cmaketoolChainProvider.name" schema="schema/toolChainProvider.exsd"/>
    <extension
          id="cmakeNature"
+         name="%cmakenature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
diff --git a/build/org.eclipse.cdt.core.autotools.core/plugin.properties b/build/org.eclipse.cdt.core.autotools.core/plugin.properties
index d255905e522..fd906036c7e 100644
--- a/build/org.eclipse.cdt.core.autotools.core/plugin.properties
+++ b/build/org.eclipse.cdt.core.autotools.core/plugin.properties
@@ -12,3 +12,4 @@
 pluginName=CDT Autotools Core
 providerName=Eclipse CDT
 extension-point.name = Autotools Core ToolChain File Provider
+autotoolsNature.name=Autotools Nature
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.core.autotools.core/plugin.xml b/build/org.eclipse.cdt.core.autotools.core/plugin.xml
index 58bd75b72d0..8b2cd3f7d72 100644
--- a/build/org.eclipse.cdt.core.autotools.core/plugin.xml
+++ b/build/org.eclipse.cdt.core.autotools.core/plugin.xml
@@ -3,6 +3,7 @@
 <plugin>
    <extension
          id="autotoolsNature"
+         name="%autotoolsNature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
diff --git a/build/org.eclipse.cdt.meson.core/plugin.properties b/build/org.eclipse.cdt.meson.core/plugin.properties
index 2064aebe936..aeb955d2b82 100644
--- a/build/org.eclipse.cdt.meson.core/plugin.properties
+++ b/build/org.eclipse.cdt.meson.core/plugin.properties
@@ -1,4 +1,5 @@
 edHatVendor.name = Red Hat
 Bundle-Name.0 = Meson Plug-in
 provider=Eclipse CDT
-extension-point.name = Meson ToolChain File Provider
\ No newline at end of file
+extension-point.name = Meson ToolChain File Provider
+mesonnature.name=Meson Nature
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.meson.core/plugin.xml b/build/org.eclipse.cdt.meson.core/plugin.xml
index b1243ae4a85..0bb0d2fe8c2 100644
--- a/build/org.eclipse.cdt.meson.core/plugin.xml
+++ b/build/org.eclipse.cdt.meson.core/plugin.xml
@@ -4,6 +4,7 @@
    <extension-point id="toolChainProvider" name="%extension-point.name" schema="schema/toolChainProvider.exsd"/>
    <extension
          id="mesonNature"
+         name="%mesonnature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 63f59d96ec8..2ebf769eb26 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -357,7 +357,7 @@
 <!-- =================================================================================== -->
    <extension
          id="ccnature"
-         name="%cnature.name"
+         name="%ccnature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
index e47acb3decf..4b9cfc45a01 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.qt.core;singleton:=true
-Bundle-Version: 2.2.200.qualifier
+Bundle-Version: 2.2.300.qualifier
 Bundle-Activator: org.eclipse.cdt.internal.qt.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/qt/org.eclipse.cdt.qt.core/plugin.properties b/qt/org.eclipse.cdt.qt.core/plugin.properties
index 5a448c955a7..a125c876cdb 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.properties
+++ b/qt/org.eclipse.cdt.qt.core/plugin.properties
@@ -15,3 +15,4 @@ qmlFile.name = QML File
 qrcFile.name = Qt Resource Collection File
 qmakeEnvProvider.name = QMake Environment Provider
 QtInstallHeaders.pathProvider.name = Qt Installed Headers
+qtNature.name=Qt Nature
\ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.core/plugin.xml b/qt/org.eclipse.cdt.qt.core/plugin.xml
index 8491d574499..c31e3954f56 100644
--- a/qt/org.eclipse.cdt.qt.core/plugin.xml
+++ b/qt/org.eclipse.cdt.qt.core/plugin.xml
@@ -30,6 +30,7 @@
    </extension>
    <extension
          id="qtNature"
+         name="%qtNature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
index 62d0048f6f0..722cf64af6f 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
@@ -14,3 +14,4 @@
 pluginName=Arduino C++ Core
 providerName=Eclipse CDT
 ArduinoBuilder.name=Arduino Builder
+arduinonature.name=Arduino Nature
\ No newline at end of file
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.xml b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.xml
index 39649eca09f..61878d2fbc8 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.xml
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.xml
@@ -70,6 +70,7 @@
    </extension>
    <extension
          id="arduinoNature"
+         name="%arduinonature.name"
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run