From 5406059f95ecaaaba0d6d9c6e5aea9f64d7a8b2d Mon Sep 17 00:00:00 2001
From: YoonKi Park <yoonki.park@samsung.com>
Date: Sun, 4 Dec 2011 17:48:54 +0900
Subject: [PATCH] [Title] load logview icon using plugin image descriptor
 [Redmine#] 3663

---
 .../tizen/common/connection/ConnectionPlugin.java  | 11 ++++++++++
 .../tizen/common/connection/ui/LogView.java        | 24 +++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ConnectionPlugin.java b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ConnectionPlugin.java
index 88f9e46..8e6caf3 100644
--- a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ConnectionPlugin.java
+++ b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ConnectionPlugin.java
@@ -9,6 +9,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -202,4 +203,14 @@ public class ConnectionPlugin extends AbstractUIPlugin {
 			}
               }
 	}
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptorFromPlugin(String path) {
+		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
 }
\ No newline at end of file
diff --git a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ui/LogView.java b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ui/LogView.java
index c412523..ef31e3b 100644
--- a/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ui/LogView.java
+++ b/com.samsung.tizen.common.connection/src/com/samsung/tizen/common/connection/ui/LogView.java
@@ -29,6 +29,7 @@ import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.part.ViewPart;
 
+import com.samsung.tizen.common.connection.ConnectionPlugin;
 import com.samsung.tizen.common.connection.ddmuilib.ImageLoader;
 import com.samsung.tizen.common.connection.log.LogColors;
 import com.samsung.tizen.common.connection.log.LogPanel;
@@ -61,11 +62,11 @@ public final class LogView extends ViewPart {
 	// private Action mGotoErrorLineAction;
 
 	private static Action[] logLevelActions;
-	private String[] logLevelIcons = { "/log/v.png", //$NON-NLS-1S
-			"/log/d.png", //$NON-NLS-1S
-			"/log/i.png", //$NON-NLS-1S
-			"/log/e.png", //$NON-NLS-1S
-			"/log/w.png", //$NON-NLS-1S
+	private String[] logLevelIcons = { "icons/log/v.png", //$NON-NLS-1S
+			"icons/log/d.png", //$NON-NLS-1S
+			"icons/log/i.png", //$NON-NLS-1S
+			"icons/log/e.png", //$NON-NLS-1S
+			"icons/log/w.png", //$NON-NLS-1S
 	};
 
 	// private Action mClearAction;
@@ -200,7 +201,7 @@ public final class LogView extends ViewPart {
 			}
 		};
 		addAction.setToolTipText("Add Tab");
-		addAction.setImageDescriptor(loader.loadDescriptor("/log/Add tab.png"));
+		addAction.setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin("icons/log/Add tab.png"));
 		
 		removeAction = new Action("Remove Tab") {
 			@Override
@@ -209,7 +210,7 @@ public final class LogView extends ViewPart {
 			}
 		};
 		removeAction.setToolTipText("Remove Tab");
-		removeAction.setImageDescriptor(loader.loadDescriptor("/log/Remove tab.png"));
+		removeAction.setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin("icons/log/Remove tab.png"));
 		
 		editAction = new Action("Edit Tab") {
 			@Override
@@ -218,7 +219,7 @@ public final class LogView extends ViewPart {
 			}
 		};
 		editAction.setToolTipText("Edit Tab");
-		editAction.setImageDescriptor(loader.loadDescriptor("/log/Edit tab.png"));
+		editAction.setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin("icons/log/Edit tab.png"));
 
 		exportAction = new Action("Export Log") {
 			@Override
@@ -227,7 +228,7 @@ public final class LogView extends ViewPart {
 			}
 		};
 		exportAction.setToolTipText("Export Log");
-		exportAction.setImageDescriptor(loader.loadDescriptor("/log/Export Log.png")); //$NON-NLS-1$
+		exportAction.setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin("icons/log/Export Log.png")); //$NON-NLS-1$
 
 		clearAction = new Action("Clear Log") {
 			@Override
@@ -236,7 +237,7 @@ public final class LogView extends ViewPart {
 			}
 		};
 		clearAction.setToolTipText("Clear Log");
-		clearAction.setImageDescriptor(loader.loadDescriptor("/log/Clear Log.png")); //$NON-NLS-1$
+		clearAction.setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin("icons/log/Clear Log.png")); //$NON-NLS-1$
 
 		// mGotoMethodDeclarationAction = new
 		// CommonAction("Go to Problem (method declaration)") {
@@ -279,8 +280,7 @@ public final class LogView extends ViewPart {
 			};
 
 			logLevelActions[i].setToolTipText(name);
-			logLevelActions[i].setImageDescriptor(loader
-					.loadDescriptor(logLevelIcons[i]));
+			logLevelActions[i].setImageDescriptor(ConnectionPlugin.getImageDescriptorFromPlugin(logLevelIcons[i]));
 		}
 
 		// now create the log view
-- 
2.7.4