[Releng] Update Extra plug-ins metadata

13 files changed, 28 insertions, 31 deletions

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
index 8a8f1668cdc..9d5026e8ffd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
index 5c9f236aa27..fe59ce08868 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/META-INF/MANIFEST.MF
@@ -15,3 +15,5 @@ Require-Bundle: org.eclipse.uml2.uml,
  org.eclipse.jdt.core,
  org.eclipse.jface.text,
  org.eclipse.jdt.launching
+Bundle-Localization: plugin
+ 
\ No newline at end of file
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
index 7915e442db0..81e0fbf3cff 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               plugin.xml,\

                icons/,\

                about.html,\

                plugin.properties

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.xml b/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.xml
deleted file mode 100644
index b60f62ae57e..00000000000
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-</plugin>

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
index f4f954410a6..a70d186f04f 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Bundle-Vendor:
 Require-Bundle: org.eclipse.core.runtime

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Export-Package: org.eclipse.papyrus.java.generator.transfo.umltojdt

+Bundle-Localization: plugin

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
index 52a7a104928..60a87c754ae 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/build.properties
@@ -3,8 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                transforms/,\

-               models/,\

                plugin.properties,\

                about.html

-src.includes = models/,\

-               about.html

+src.includes = about.html

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
index 88e51c56902..7d387085329 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt/plugin.properties
@@ -16,4 +16,4 @@
 

 

 pluginName=Papyrus Java Classes Generator transformations (Incubation)

-providerName= Nicolas Deblock and Manuel Giles 

+providerName=Eclipse Modeling Project

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
index f1681db6da4..94a1418e893 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.papyrus.java.generator.ui.Activator
 Export-Package: org.eclipse.papyrus.java.generator.ui
+Bundle-Localization: plugin
diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
index b1c61d00f99..c561698838c 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/plugin.properties
@@ -16,4 +16,4 @@
 

 

 pluginName=Papyrus Java Classes Generator UI (Incubation)

-providerName= Nicolas Deblock and Manuel Giles and Cedric Dumoulin

+providerName=Eclipse Modeling Project

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
index fc8b6f40400..3ba3075565e 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/Activator.java
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.java.javagen.ui"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.java.generator.ui"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

@@ -41,6 +41,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

 		plugin = this;

@@ -51,6 +52,7 @@ public class Activator extends AbstractUIPlugin {
 	 * 

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

+	@Override

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

 		super.stop(context);

diff --git a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
index b1ca5e6aec5..f683ac72b31 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
+++ b/extraplugins/java/org.eclipse.papyrus.java.generator.ui/src/org/eclipse/papyrus/java/generator/ui/preference/GeneratorPreferenceImpl.java
@@ -45,30 +45,35 @@ public class GeneratorPreferenceImpl implements GeneratorPreference {
 	}

 

 	public boolean isPackageToGenerate(String packageQualifiedName) {

-		if(packageQualifiedName == null || packageQualifiedName.isEmpty())

+		if(packageQualifiedName == null || packageQualifiedName.isEmpty()) {

 			return true;

+		}

 

 		// gather list of packages :

 		String listStr = store.getString(PreferenceConstants.P_FILTER_OF_PACKAGE_NOT_TO_GENERATE);

 

 		// if list of package don't exist, return true

-		if(listStr == null || listStr.isEmpty())

+		if(listStr == null || listStr.isEmpty()) {

 			return true;

+		}

 

 		// gather list in a table

 		String[] listPackage = listStr.split(";");

 

 		for(String _package : listPackage) {

-			if(_package.equals(packageQualifiedName))

+			if(_package.equals(packageQualifiedName)) {

 				return false;

+			}

 

 			// if package have a *, we delete *			

 			String packageWithoutStar = _package;

-			if(_package.contains("*"))

+			if(_package.contains("*")) {

 				packageWithoutStar = _package.substring(0, _package.indexOf("*") - 1);

+			}

 

-			if(packageQualifiedName.contains(packageWithoutStar))

+			if(packageQualifiedName.contains(packageWithoutStar)) {

 				return false;

+			}

 		}

 

 		// by default, return true

@@ -79,7 +84,6 @@ public class GeneratorPreferenceImpl implements GeneratorPreference {
 		return store.getString(PreferenceConstants.P_GENERIC_CLASS_FOR_MULTIVALUE);

 	}

 

-	@Override

 	public boolean stopOnFirstError() {

 		return store.getBoolean(PreferenceConstants.P_STOP_ON_FIRST_ERROR);

 	}

diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath b/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath
index 16d067f284a..9d5026e8ffd 100644
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath
+++ b/extraplugins/java/org.eclipse.papyrus.java.reverse/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/java/org.eclipse.papyrus.java.reverse/plugin.xml b/extraplugins/java/org.eclipse.papyrus.java.reverse/plugin.xml
deleted file mode 100644
index 64943018a89..00000000000
--- a/extraplugins/java/org.eclipse.papyrus.java.reverse/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-</plugin>