Bug 443799 - Fix potential bugs identified by FindBugs in oep.infra.*

Bug 499554 - Oxygen release version number moved to 3.0.0.

Change-Id: I8e112db7175a5b89eb9b37973639627a6c29e007

11 files changed, 61 insertions, 61 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
index cf25f97cd5c..7e62ee0e930 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xtend
@@ -43,7 +43,7 @@ import xpt.Common
 				java.util.List<org.eclipse.emf.ecore.EObject> todestroy=new java.util.ArrayList<org.eclipse.emf.ecore.EObject>();

 				todestroy.add(req.getElementToDestroy());

 				//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-				cmd.add(new org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(),todestroy )));

+				cmd.add(new org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(),todestroy )));

 				return getGEFWrapper(cmd.reduce());

 				//return getGEFWrapper(«newDeleteLinkWithClassCommand(it,genLink, 'req')»);

 			}

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
index cad9fffee3d..5da4736c1e6 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xtend
@@ -93,7 +93,7 @@ protected org.eclipse.gef.commands.Command getDestroyElementCommand(org.eclipse.
 		java.util.List<org.eclipse.emf.ecore.EObject> todestroy=new java.util.ArrayList<org.eclipse.emf.ecore.EObject>();

 		todestroy.add(req.getElementToDestroy());

 		//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

-		cmd.add(new org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(),todestroy )));

+		cmd.add(new org.eclipse.papyrus.infra.emf.gmf.command.EMFtoGMFCommandWrapper(new org.eclipse.emf.edit.command.DeleteCommand(getEditingDomain(),todestroy )));

 	} else {«««Here, we may play smart and don't generate else for non-toplevel nodes(which can't be shortcuts). Is it worth doing?

 		cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

 	}

diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
index df8bb93cc2a..731b44ce2ae 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.codegen;bundle-version="[2.11.0,3.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
index 073c7e32dcc..cc3ee8f94d9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
index 5a5bc064846..081ed0d52b7 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.developer</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.dev.types</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-	<build>
-        <plugins>
-            <!-- Empty out the xtend-gen folder in the clean phase. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>xtend-gen</directory>
-                            <excludes>
-                               <exclude>**/.gitignore</exclude>
-                            </excludes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <!-- Generate Xtend sources in the compilation phase. -->
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>xtend-gen</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<parent>

+		<artifactId>org.eclipse.papyrus.developer</artifactId>

+		<groupId>org.eclipse.papyrus</groupId>

+		<version>0.0.1-SNAPSHOT</version>

+	</parent>

+	<artifactId>org.eclipse.papyrus.dev.types</artifactId>

+	<groupId>org.eclipse.papyrus</groupId>

+	<version>3.0.0-SNAPSHOT</version>

+	<packaging>eclipse-plugin</packaging>

+	<build>

+        <plugins>

+            <!-- Empty out the xtend-gen folder in the clean phase. -->

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-clean-plugin</artifactId>

+                <configuration>

+                    <filesets>

+                        <fileset>

+                            <directory>xtend-gen</directory>

+                            <excludes>

+                               <exclude>**/.gitignore</exclude>

+                            </excludes>

+                        </fileset>

+                    </filesets>

+                </configuration>

+            </plugin>

+            <!-- Generate Xtend sources in the compilation phase. -->

+            <plugin>

+                <groupId>org.eclipse.xtend</groupId>

+                <artifactId>xtend-maven-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <goals>

+                            <goal>compile</goal>

+                        </goals>

+                        <configuration>

+                            <outputDirectory>xtend-gen</outputDirectory>

+                        </configuration>

+                    </execution>

+                </executions>

+            </plugin>

+        </plugins>

+    </build>

+</project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
index a4b51476dae..8330ade9420 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.gmf.editpartview,
  org.eclipse.papyrus.gmf.editpartview.view
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
index 944ab132610..d76704529d8 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
index 6ddf0f40740..d983f3eafcc 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Export-Package: org.eclipse.papyrus.gmf.figureview,
  org.eclipse.papyrus.gmf.figureview.view
 Require-Bundle: org.eclipse.papyrus.emf.facet.common.ui;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
index 2bb3741df85..32b202cd92c 100644
--- a/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.infra.gmfdiag.css.debug/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.3.0,2.0.0)",
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="[1.2.0,2.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.css.configuration;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index 3295db7b610..718ec3cefda 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.editor;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.hyperlink;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/developer/pom.xml b/plugins/developer/pom.xml
index c3e5c4b4378..539394687f3 100644
--- a/plugins/developer/pom.xml
+++ b/plugins/developer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>org.eclipse.papyrus.dev.releng</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>../../releng/dev/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.developer</artifactId>