[494988] Addition of default translatable plugin.properties in VSP.

During VSP creation, a plugin.properties file is added to the VSP
project to support translatable modelers.

Bug: 495135
Change-Id: I4170962dfa6cd03f056fb4eb899936019ae78b33
Signed-off-by: Jessy Mallet <jessy.mallet@obeo.fr>

5 files changed, 23 insertions, 2 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
index ae6e3336da..388193c7fa 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ViewpointSpecificationProjectCreationTest.java
@@ -118,6 +118,7 @@ public class ViewpointSpecificationProjectCreationTest extends AbstractSiriusSwt
         assertNotNull(VSP_SHOULD_CONTAIN + "an odesign in the description folder. The odesign name should be " + VSM, vsm);
         assertNotNull(VSP_SHOULD_CONTAIN + "a plugin.xml file." + VSM, project.getFile("plugin.xml"));
         assertNotNull(VSP_SHOULD_CONTAIN + "a build.properties file." + VSM, project.getFile("build.properties"));
+        assertNotNull(VSP_SHOULD_CONTAIN + "a plugin.properties file." + VSM, project.getFile("plugin.properties"));
         assertNotNull(VSP_SHOULD_CONTAIN + ".classpath file.", project.getFile(".classpath"));
         assertNotNull(VSP_SHOULD_CONTAIN + ".project file.", project.getFile(".project"));
         assertNotNull(VSP_SHOULD_CONTAIN + "MANIFEST.MF file.", project.getFile("META-INF/MANIFEST.MF"));
diff --git a/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF b/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
index d4256031a1..e2b74529e0 100644
--- a/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.ui/resources/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginId
+Bundle-Name: %pluginName
 Bundle-SymbolicName: %pluginId;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: %packageName.Activator
+Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -11,3 +12,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.common.acceleo.aql
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.sirius.ui/resources/build.properties b/plugins/org.eclipse.sirius.ui/resources/build.properties
index c94531ff9e..1ab7df2cb6 100644
--- a/plugins/org.eclipse.sirius.ui/resources/build.properties
+++ b/plugins/org.eclipse.sirius.ui/resources/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                description/,\
+               plugin.properties,\
                plugin.xml
diff --git a/plugins/org.eclipse.sirius.ui/resources/plugin.properties b/plugins/org.eclipse.sirius.ui/resources/plugin.properties
new file mode 100644
index 0000000000..89e38ff55c
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui/resources/plugin.properties
@@ -0,0 +1,3 @@
+pluginName = %pluginId
+providerName = %defaultProviderName
+viewpointName = %viewpointName
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
index 942a4ad228..905bd19280 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java
@@ -91,6 +91,16 @@ public final class ViewpointSpecificationProject {
      * The dot separator path.
      */
     private static final String DOT_SEPARATOR_PATH = "\\."; //$NON-NLS-1$
+    
+    /**
+     * The default provider name for Manifest.
+     */
+    private static final String DEFAULT_PROVIDER_NAME = "Eclipse Modeling Project"; //$NON-NLS-1$
+    
+    /**
+     * Default viewpoint name used in VSM file..
+     */
+    private static final String MY_VIEWPOINT = "MyViewpoint"; //$NON-NLS-1$
 
     /**
      * The line separator to use on the running platform.
@@ -257,6 +267,7 @@ public final class ViewpointSpecificationProject {
                             ((Group) rootObject).setName(modelName.replaceAll("." + VIEWPOINT_MODEL_EXTENSION, "")); //$NON-NLS-1$ //$NON-NLS-2$
                             Viewpoint viewpoint = DescriptionFactory.eINSTANCE.createViewpoint();
                             viewpoint.setName("MyViewpoint"); //$NON-NLS-1$
+                            viewpoint.setLabel("%viewpointName"); //$NON-NLS-1$
                             JavaExtension javaExtension = DescriptionFactory.eINSTANCE.createJavaExtension();
                             javaExtension.setQualifiedClassName(javaExtensionQualifiedName);
                             viewpoint.getOwnedJavaExtensions().add(javaExtension);
@@ -351,14 +362,17 @@ public final class ViewpointSpecificationProject {
         replacements.put("projectName", projectName); //$NON-NLS-1$
         replacements.put("modelName", modelNameWithoutExtension); //$NON-NLS-1$
         replacements.put("packageName", packageName); //$NON-NLS-1$
+        replacements.put("defaultProviderName", DEFAULT_PROVIDER_NAME); //$NON-NLS-1$ 
+        replacements.put("viewpointName", MY_VIEWPOINT); //$NON-NLS-1$ 
 
         ViewpointSpecificationProject.createFileFromTemplate(prj, "build.properties", "resources/build.properties", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
+        ViewpointSpecificationProject.createFileFromTemplate(prj, "plugin.properties", "resources/plugin.properties", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
         ViewpointSpecificationProject.createFileFromTemplate(prj, "src/" + packageName.replaceAll(DOT_SEPARATOR_PATH, "/") + "/Activator.java", "resources/Activator.java_", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
         ViewpointSpecificationProject.createFileFromTemplate(prj, "src/" + packageName.replaceAll(DOT_SEPARATOR_PATH, "/") + "/Services.java", "resources/Services.java_", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
         ViewpointSpecificationProject.createFileFromTemplate(prj, ".classpath", "resources/classpath.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
         ViewpointSpecificationProject.createFileFromTemplate(prj, "META-INF/MANIFEST.MF", "resources/MANIFEST.MF", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
         ViewpointSpecificationProject.createFileFromTemplate(prj, ".project", "resources/project.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-        ViewpointSpecificationProject.createFileFromTemplate(prj, "plugin.xml", "resources/plugin.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
+        ViewpointSpecificationProject.createFileFromTemplate(prj, "plugin.xml", "resources/plugin.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$   
     }
 
     /**