From: jy.exe.lee Date: Wed, 4 Jul 2012 06:55:19 +0000 (+0900) Subject: [Title] brand image path fixed X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3aae8bf016353d143097e2c909b9cd30f39f6bf6;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] brand image path fixed [Type] bug fix [Module] DynamicAnalyzer [Priority] major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java index 61a668e..5095f4f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ImageResources.java @@ -257,16 +257,21 @@ public class ImageResources { private static DATheme getTheme() { return AnalyzerManager.getTheme(); } - + private static Image getImage(String imageName, String extension) { return getImage(ID, getTheme().getImagePath(), imageName, extension); } private static Image getImageFromWorkbench(String imageName) { - return getImage(WORKBENCH_ID, getTheme().getIconPath(), imageName, + return getImage(WORKBENCH_ID, + AnalyzerConstants.ICON_WORKBENCH_FOLDER_NAME, imageName, AnalyzerConstants.EXTENSION_PNG_IMAGE); } + private static Image getIcon(String iconName, String extension) { + return getImage(ID, getTheme().getIconPath(), iconName, extension); + } + // private static Image getImageFromWorkbench(String imageName) { // return getImage(WORKBENCH_ID, AnalyzerConstants.ICON_FOLDER_NAME, // imageName, AnalyzerConstants.EXTENSION_PNG_IMAGE); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java index 049843c..41ff455 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java @@ -53,7 +53,7 @@ public class AnalyzerConstants { // for snapshot image save public static final String IMAGE_FOLDER_NAME = File.separator + "img"; //$NON-NLS-1$ // public static final String IMAGES_FOLDER_NAME = "images" + File.separator; //$NON-NLS-1$ -// public static final String ICON_FOLDER_NAME = "icons" + File.separator; //$NON-NLS-1$ + public static final String ICON_WORKBENCH_FOLDER_NAME = "icons" + File.separator; //$NON-NLS-1$ public static final String ICON_FOLDER_NAME = AnalyzerManager.getTheme().getIconPath(); public static final String XML_FOLDER_NAME = File.separator + "xml"; //$NON-NLS-1$ public static final String TOOL_FOLDER_NAME = "tools"; //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java index 605e65c..0af8c7b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java @@ -202,7 +202,7 @@ public class TimelineMaster { ImageDescriptor imgDesc = SnapshotData.getInstance().getImageHash().get(seq); if (null == imgDesc) { - imgDesc = AbstractUIPlugin.imageDescriptorFromPlugin(ID, AnalyzerConstants.ICON_FOLDER_NAME + NO_IMAGE); + imgDesc = AbstractUIPlugin.imageDescriptorFromPlugin(ID, AnalyzerConstants.ICON_WORKBENCH_FOLDER_NAME + NO_IMAGE); if (null == imgDesc) { return; } @@ -248,7 +248,7 @@ public class TimelineMaster { ImageDescriptor imgDesc = SnapshotData.getInstance().getRedRectImageBySeq(snapShotInfo.seq); if (null == imgDesc) { - imgDesc = AbstractUIPlugin.imageDescriptorFromPlugin(ID, AnalyzerConstants.ICON_FOLDER_NAME + NO_IMAGE); + imgDesc = AbstractUIPlugin.imageDescriptorFromPlugin(ID, AnalyzerConstants.ICON_WORKBENCH_FOLDER_NAME + NO_IMAGE); if (null == imgDesc) { return; }