NL: move internal string from label file to constant class

move internal string from label file to constant class

Change-Id: Ic295dd5a4d9f4a02311afa1302f7740bd82409ba
Signed-off-by: greatim <jaewon81.lim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
index bd84829..e5217aa 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
@@ -89,14 +89,6 @@ public class ConfigureLabels extends NLS {
        public static String TEMPLATE_DESCRIPTION_ENERGY;
        public static String TEMPLATE_DESCRIPTION_CUSTOM;
        
-       public static String PAGE_NAME_TIME_LINE;
-       public static String PAGE_NAME_SUMMARY;
-       public static String PAGE_NAME_FILE;
-       public static String PAGE_NAME_THREAD;
-       public static String PAGE_NAME_NETWORK;
-       public static String PAGE_NAME_OPENGL;
-       public static String PAGE_NAME_KERNEL;
-
        public static String FEATURE_NAME_SYSTEM; // 3.0 only
        public static String FEATURE_NAME_SYSTEM_CPU; // 3.0 only
        public static String FEATURE_NAME_SYSTEM_PROCESS; // 3.0 only

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
index 4f679d0..bfe02fb 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
@@ -56,14 +56,6 @@ TEMPLATE_DESCRIPTION_OPEN_GL=This template shows a lot of detailed information o
 TEMPLATE_DESCRIPTION_ENERGY=This template inform you of power consumption of target device. you can see this information from Energy chart in Timeline page. Energy chart shows usage of Flash memory, CPU, LCD.
 TEMPLATE_DESCRIPTION_CUSTOM=This template can be configured by selecting the desired features. If you change the feature in the other template will change custom template.
 
-PAGE_NAME_TIME_LINE=Timeline
-PAGE_NAME_SUMMARY=Summary
-PAGE_NAME_FILE=File
-PAGE_NAME_THREAD=Thread
-PAGE_NAME_NETWORK=Network
-PAGE_NAME_OPENGL=OpenGL
-PAGE_NAME_KERNEL=Kernel
-
 FEATURE_NAME_SYSTEM=System
 FEATURE_NAME_SYSTEM_CPU=System CPU
 FEATURE_NAME_SYSTEM_PROCESS=Target process

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingConstants.java
index 7621a73..feb4158 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/SettingConstants.java
@@ -111,4 +111,14 @@ public class SettingConstants {
 
        // overhead and call count measuring time = 30 sec
        public static final int OVERHEAD_AVG_SECONDS = 30;
+       
+       /** about UI **/
+       // page names
+       public static String PAGE_NAME_TIME_LINE = "Timeline";
+       public static String PAGE_NAME_SUMMARY = "Summary";
+       public static String PAGE_NAME_FILE = "File";
+       public static String PAGE_NAME_THREAD = "Thread";
+       public static String PAGE_NAME_NETWORK = "Network";
+       public static String PAGE_NAME_OPENGL = "OpenGL";
+       public static String PAGE_NAME_KERNEL = "Kernel";
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
index c59d1cd..093d071 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
@@ -37,8 +37,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.part.ViewPart;
 import org.tizen.dynamicanalyzer.annotation.UIMethod;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
-import org.tizen.dynamicanalyzer.nl.ConfigureLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
+import org.tizen.dynamicanalyzer.setting.SettingConstants;
 import org.tizen.dynamicanalyzer.setting.SettingDataManager;
 import org.tizen.dynamicanalyzer.ui.file.FilePage;
 import org.tizen.dynamicanalyzer.ui.interactive.InteractivePage;
@@ -95,27 +95,27 @@ public class BaseView extends ViewPart {
 
                if (selectedPageList != null) {
                        // thread tab
-                       if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_THREAD)) {
+                       if (selectedPageList.contains(SettingConstants.PAGE_NAME_THREAD)) {
                                tabViewList.add(AnalyzerConstants.PAGE_THREAD);
                        } // else nothing
 
                        // network tab
-                       if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_NETWORK)) {
+                       if (selectedPageList.contains(SettingConstants.PAGE_NAME_NETWORK)) {
                                tabViewList.add(AnalyzerConstants.PAGE_NETWORK);
                        } // else nothing
 
                        // file tab
-                       if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_FILE)) {
+                       if (selectedPageList.contains(SettingConstants.PAGE_NAME_FILE)) {
                                tabViewList.add(AnalyzerConstants.PAGE_FILE);
                        } // else nothing
 
                        // openGL tab
-                       if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_OPENGL)) {
+                       if (selectedPageList.contains(SettingConstants.PAGE_NAME_OPENGL)) {
                                tabViewList.add(AnalyzerConstants.PAGE_GRAPHICS);
                        } // else nothing
 
                        // kernel tab
-                       if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_KERNEL)) {
+                       if (selectedPageList.contains(SettingConstants.PAGE_NAME_KERNEL)) {
                                tabViewList.add(AnalyzerConstants.PAGE_KERNEL);
                        } // else nothing
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java
index e2fcf89..51c7f57 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java
@@ -219,27 +219,27 @@ public class SettingDialogManager {
                tabViewList.add(AnalyzerConstants.PAGE_TIME_LINE); // default : timeline tab
 
                // thread tab
-               if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_THREAD)) {
+               if (selectedPageList.contains(SettingConstants.PAGE_NAME_THREAD)) {
                        tabViewList.add(AnalyzerConstants.PAGE_THREAD);
                } // else nothing
 
                // network tab
-               if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_NETWORK)) {
+               if (selectedPageList.contains(SettingConstants.PAGE_NAME_NETWORK)) {
                        tabViewList.add(AnalyzerConstants.PAGE_NETWORK);
                } // else nothing
 
                // file tab
-               if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_FILE)) {
+               if (selectedPageList.contains(SettingConstants.PAGE_NAME_FILE)) {
                        tabViewList.add(AnalyzerConstants.PAGE_FILE);
                } // else nothing
 
                // openGL tab
-               if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_OPENGL)) {
+               if (selectedPageList.contains(SettingConstants.PAGE_NAME_OPENGL)) {
                        tabViewList.add(AnalyzerConstants.PAGE_GRAPHICS);
                } // else nothing
 
                // kernel tab
-               if (selectedPageList.contains(ConfigureLabels.PAGE_NAME_KERNEL)) {
+               if (selectedPageList.contains(SettingConstants.PAGE_NAME_KERNEL)) {
                        tabViewList.add(AnalyzerConstants.PAGE_KERNEL);
                } // else nothing