bug 517752 - Papyrus views have the project name in their titles

Actions
-assign right category for the views
-removing papyrus word for view
-adding default Papyrus icon when missing
-adding a wizard category for table
-typo correction
-rebase on master

Tests
-start runtime and check views

Change-Id: If12a6f47b20ff8c174198f31082dff1d7412a674
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=517752
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>

4 files changed, 10 insertions, 5 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
index 653ec3c3daf..4630760ff93 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                .,\

                plugin.xml,\

                about.html,\

+               icons/,\

                plugin.properties

 src.includes = about.html

diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/icons/Papyrus.gif b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/icons/Papyrus.gif
new file mode 100644
index 00000000000..8a31f458379
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/icons/Papyrus.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
index 59603a32fb6..23252cb9249 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.properties
@@ -9,4 +9,5 @@
 #    Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - initial API and implementation

 ##################################################################################

 pluginName=OCL Constraint evaluation

-providerName=Eclipse Modeling Project
\ No newline at end of file
+providerName=Eclipse Modeling Project

+view.name=OCL Evaluation
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.xml
index 2a53b85ee53..8a9b1fb2656 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.oclconstraintevaluation/plugin.xml
@@ -26,10 +26,13 @@
       </menuContribution>

    </extension>

    <extension point="org.eclipse.ui.views">

-        <view id="org.eclipse.papyrus.uml.oclconstraintevaluation.OCLEvaluationView"

-             name="OCL evaluation View"

-          class="org.eclipse.papyrus.uml.oclconstraintevaluation.OCLEvaluationView"

+        <view 

+        	category="org.eclipse.papyrus.views.category"

+        	id="org.eclipse.papyrus.uml.oclconstraintevaluation.OCLEvaluationView"

+            name="%view.name"

+            icon="icons/Papyrus.gif"

+            class="org.eclipse.papyrus.uml.oclconstraintevaluation.OCLEvaluationView"

        />

-</extension>

+	</extension>

 

 </plugin>