443799: [Code Quality] Cleanup code according to FindBugs results

https://bugs.eclipse.org/bugs/show_bug.cgi?id=443799

- Fix issues in various bundles

3 files changed, 10 insertions, 18 deletions

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
index bea8d0460da..d2712ca234c 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/Activator.java
@@ -47,18 +47,6 @@ public class Activator extends Plugin {
 
 	public static LogHelper log;
 
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("com.cea.papyrus.umlutils.PluginManagerResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
 	/*
 	 * (non-Javadoc)
 	 *
@@ -75,6 +63,7 @@ public class Activator extends Plugin {
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		log = new LogHelper(this);
+		plugin = this;
 	}
 
 	/*
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
index 5f891399eb7..3be30ca7651 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ElementUtil.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.uml.tools.utils;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -271,8 +272,10 @@ public class ElementUtil {
 	 */
 	public static List<Type> getMetaclasses(Element element) {
 		if (element == null) {
-			System.err.println("element should not be null to retrieve metaclasses");
+			Activator.log.warn("element should not be null to retrieve metaclasses");
+			return Collections.emptyList();
 		}
+
 		org.eclipse.uml2.uml.Package uml2Metamodel = contentload(URI.createURI(UMLResource.UML_METAMODEL_URI), element);
 
 		return uml2Metamodel.getOwnedTypes();
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
index 5925dc237f8..ae1f88be328 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/ImageUtil.java
@@ -45,18 +45,18 @@ public class ImageUtil {
 	/**

 	 * ID of the EAnnotation where "expression" (used to select stereotype icon) is stored on image.

 	 */

-	public static String IMAGE_PAPYRUS_EA = "image_papyrus";

+	public static final String IMAGE_PAPYRUS_EA = "image_papyrus";

 

 	/**

 	 * KEY of the EAnnotation where "expression" (used to select stereotype icon) is stored on

 	 * image.

 	 */

-	public static String IMAGE_EXPR_KEY = "image_expr_key";

+	public static final String IMAGE_EXPR_KEY = "image_expr_key";

 

 	/**

 	 * KEY of the EAnnotation where "kind" (kind = icon/shape) is stored on image.

 	 */

-	public static String IMAGE_KIND_KEY = "image_kind_key";

+	public static final String IMAGE_KIND_KEY = "image_kind_key";

 

 	/**

 	 * KEY of the EAnnotation where the image's name is stored

@@ -64,7 +64,7 @@ public class ImageUtil {
 	 * @see {@link #getName(Image)}

 	 * @see {@link #setName(Image, String)}

 	 */

-	public static String IMAGE_NAME_KEY = "image_name_key";

+	public static final String IMAGE_NAME_KEY = "image_name_key";

 

 	/**

 	 * Set the content of an {@link Image} with a file (containing an image).

@@ -305,7 +305,7 @@ public class ImageUtil {
 	 * @param image

 	 *            the image

 	 * @return

-	 *         the name associated to the image

+	 * 		the name associated to the image

 	 */

 	public static String getName(Image image) {

 		EAnnotation ea_Image = image.getEAnnotation(ImageUtil.IMAGE_PAPYRUS_EA);