tmf: Update copyright headers in tmf.ui

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / uml2sd / drawings / impl / ImageImpl.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java
index 5a4ec5f55350451553cf6c3f945082a5ecc07cb2..cbf60ecafff2e45e561ca1cd91f1fe346001bf30 100755 (executable)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/drawings/impl/ImageImpl.java
@@ -1,41 +1,38 @@
 /**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * Copyright (c) 2011, 2012 Ericsson.
- * 
+ * Copyright (c) 2005, 2012 IBM Corporation, Ericsson
  * All rights reserved.   This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * Bernd Hufmann - Updated for TMF
+ *
+ * Contributors:
+ *     IBM - Initial API and implementation
+ *     Bernd Hufmann - Updated for TMF
  **********************************************************************/
+
 package org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.impl;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.linuxtools.internal.tmf.ui.TmfUiPlugin;
+import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IImage;
 import org.eclipse.swt.graphics.Image;
 
 /**
  * Default implementation of the IImage interface.
- * 
+ *
  * @version 1.0
  * @author sveyrier
- * 
+ *
  */
 public class ImageImpl implements IImage {
 
     // ------------------------------------------------------------------------
     // Attributes
     // ------------------------------------------------------------------------
-   
+
     /**
      * The image reference
      */
@@ -46,7 +43,7 @@ public class ImageImpl implements IImage {
     // ------------------------------------------------------------------------
     /**
      * Default constructor.
-     * 
+     *
      * @param file A file name of image file.
      */
     public ImageImpl(String file) {
@@ -55,7 +52,7 @@ public class ImageImpl implements IImage {
 
     /**
      * Copy constructor
-     * 
+     *
      * @param image THe image to copy
      */
     public ImageImpl(Image image) {
@@ -67,7 +64,7 @@ public class ImageImpl implements IImage {
     // ------------------------------------------------------------------------
     /**
      * Returns Image object from file name.
-     * 
+     *
      * @param name File name of image file
      * @return image object or <code>null</code>
      */
@@ -97,18 +94,18 @@ public class ImageImpl implements IImage {
 
     /**
      * Returns Image object from file name.
-     * 
+     *
      * @param name File name of image file
      * @return image object or <code>null</code>
      */
-    private Image createResourceImage(String name) {
+    private static Image createResourceImage(String name) {
         try {
             URL BASIC_URL = new URL("platform", "localhost", "plugin");//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             URL url = new URL(BASIC_URL, "plugin/org.eclipse.linuxtools.tmf.ui/icons/" + name);//$NON-NLS-1$
             ImageDescriptor img = ImageDescriptor.createFromURL(url);
             return img.createImage();
         } catch (MalformedURLException e) {
-            TmfUiPlugin.getDefault().logError("Error opening image file", e);  //$NON-NLS-1$
+            Activator.getDefault().logError("Error opening image file", e);  //$NON-NLS-1$
         }
         return null;
     }