[Title] update configuraion dlg

[Desc.] change feature name , and remove feature
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
index 6d0f538..fa143ea 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
@@ -184,24 +184,26 @@ public class AnalyzerConstants {
        public static final int FEATURE_SCREENSHOT = 0x0080;\r
        public static final int FEATURE_USER_EVENT = 0x0100;\r
        public static final int FEATURE_RECORDING = 0x0200;\r
-       public static final int FEATURE_SYSCALL_FILE = 0x0400;\r
-       public static final int FEATURE_SYSCALL_IPC = 0x0800;\r
-       public static final int FEATURE_SYSCALL_PROCESS = 0x1000;\r
-       public static final int FEATURE_SYSCALL_SIGNAL = 0x2000;\r
-       public static final int FEATURE_SYSCALL_NETWORK = 0x4000;\r
-       public static final int FEATURE_SYSCALL_DESC = 0x8000;\r
+       public static final int FEATURE_SYSCALL = 0x0400;\r
+//     public static final int FEATURE_SYSCALL_FILE = 0x0400;\r
+//     public static final int FEATURE_SYSCALL_IPC = 0x0800;\r
+//     public static final int FEATURE_SYSCALL_PROCESS = 0x1000;\r
+//     public static final int FEATURE_SYSCALL_SIGNAL = 0x2000;\r
+//     public static final int FEATURE_SYSCALL_NETWORK = 0x4000;\r
+//     public static final int FEATURE_SYSCALL_DESC = 0x8000;\r
        public static final int FEATURE_CONTEXT_SWITCHING = 0x10000;\r
        public static final int FEATURE_NETWORK_API = 0x20000;\r
        public static final int FEATURE_OPENGL_API = 0x40000;\r
        public static final int FEATURE_FUNCTION_SAMPLING = 0x80000;\r
-       public static final int SYSTEM_CPU = 0x100000;\r
-       public static final int SYSTEM_PROCESSES = 0x200000;\r
-       public static final int SYSTEM_MEMORY = 0x400000;\r
-       public static final int SYSTEM_DISK = 0x800000;\r
-       public static final int SYSTEM_NETWORK = 0x1000000;\r
-       public static final int SYSTEM_DEVICE = 0x2000000;\r
+       public static final int SYSTEM = 0x100000;\r
+//     public static final int SYSTEM_CPU = 0x100000;\r
+//     public static final int SYSTEM_PROCESSES = 0x200000;\r
+//     public static final int SYSTEM_MEMORY = 0x400000;\r
+//     public static final int SYSTEM_DISK = 0x800000;\r
+//     public static final int SYSTEM_NETWORK = 0x1000000;\r
+//     public static final int SYSTEM_DEVICE = 0x2000000;      \r
+//     public static final int SYSTEM_RESERVED = 0x8000000;\r
        public static final int SYSTEM_ENERGY = 0x4000000;\r
-       public static final int SYSTEM_RESERVED = 0x8000000;\r
 \r
        /* Message Type */\r
        public static final int MSG_APP_INFO = 1; //$NON-NLS-1$\r

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 5a2c4aa..59e9eb2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java
@@ -53,22 +53,24 @@ public class ConfigureLabels extends NLS {
        public static String FEATURE_SCREENSHOT;
        public static String FEATURE_USER_EVENT;
        public static String FEATURE_RECORDING;
-       public static String FEATURE_SYSCALL_FILE; // 3.0 only
-       public static String FEATURE_SYSCALL_IPC; // 3.0 only
-       public static String FEATURE_SYSCALL_PROCESS; // 3.0 only
-       public static String FEATURE_SYSCALL_SIGNAL; // 3.0 only
-       public static String FEATURE_SYSCALL_NETWORK; // 3.0 only
-       public static String FEATURE_SYSCALL_DESC; // 3.0 only
+       public static String FEATURE_SYSCALL; // 3.0 only
+//     public static String FEATURE_SYSCALL_FILE; // 3.0 only
+//     public static String FEATURE_SYSCALL_IPC; // 3.0 only
+//     public static String FEATURE_SYSCALL_PROCESS; // 3.0 only
+//     public static String FEATURE_SYSCALL_SIGNAL; // 3.0 only
+//     public static String FEATURE_SYSCALL_NETWORK; // 3.0 only
+//     public static String FEATURE_SYSCALL_DESC; // 3.0 only
        public static String FEATURE_CONTEXT_SWITCH; // 3.0 only
        public static String FEATURE_NETWORK; // 3.0 only
        public static String FEATURE_OPENGL; // 3.0 only
-       public static String FEATURE_FUNCTION_SAMPLING; // 3.0 only
-       public static String FEATURE_SYSTEM_CPU; // 3.0 only
-       public static String FEATURE_SYSTEM_PROCESSES; // 3.0 only
-       public static String FEATURE_SYSTEM_MEMORY; // 3.0 only
-       public static String FEATURE_SYSTEM_DISK; // 3.0 only
-       public static String FEATURE_SYSTEM_NETWORK; // 3.0 only
-       public static String FEATURE_SYSTEM_DEVICE; // 3.0 only
+       //public static String FEATURE_FUNCTION_SAMPLING; // 3.0 only
+       public static String FEATURE_SYSTEM; // 3.0 only
+//     public static String FEATURE_SYSTEM_CPU; // 3.0 only
+//     public static String FEATURE_SYSTEM_PROCESSES; // 3.0 only
+//     public static String FEATURE_SYSTEM_MEMORY; // 3.0 only
+//     public static String FEATURE_SYSTEM_DISK; // 3.0 only
+//     public static String FEATURE_SYSTEM_NETWORK; // 3.0 only
+//     public static String FEATURE_SYSTEM_DEVICE; // 3.0 only
        public static String FEATURE_SYSTEM_ENERGY; // 3.0 only
 
        public static String DETAIL_FUNCTIONPROFILING;

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 6388755..7b8f2b2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
@@ -12,28 +12,29 @@ WELCONE_ASK_USE_AGAIN=Use this as the default and do not ask again.
 
 FEATURE_FUNCTION_PROFILING=Function_Profiling
 FEATURE_MEMORY_ALLOCATION=Memory_Allocation
-FEATURE_FILE=File
-FEATURE_THREAD=Thread
-FEATURE_USERINTERFACE=UserInterface
+FEATURE_FILE=File Analysis
+FEATURE_THREAD=Thread Analysis
+FEATURE_USERINTERFACE=Tizen UI Analysis
 FEATURE_SCREENSHOT=Screenshot
-FEATURE_USER_EVENT=Event
+FEATURE_USER_EVENT=UI Event
 FEATURE_RECORDING=Recording
-FEATURE_SYSCALL_FILE=System call file
-FEATURE_SYSCALL_IPC=System call ipc
-FEATURE_SYSCALL_PROCESS=System call process
-FEATURE_SYSCALL_SIGNAL=System call signal
-FEATURE_SYSCALL_NETWORK=System call network
-FEATURE_SYSCALL_DESC=System call desc
+FEATURE_SYSCALL = System call
+#FEATURE_SYSCALL_FILE=System call file
+#FEATURE_SYSCALL_IPC=System call ipc
+#FEATURE_SYSCALL_PROCESS=System call process
+#FEATURE_SYSCALL_SIGNAL=System call signal
+#FEATURE_SYSCALL_NETWORK=System call network
+#FEATURE_SYSCALL_DESC=System call desc
 FEATURE_CONTEXT_SWITCH=Context switch
-FEATURE_NETWORK=Network
-FEATURE_OPENGL=Open GL
-FEATURE_FUNCTION_SAMPLING=Function sampling
-FEATURE_SYSTEM_CPU=System CPU
-FEATURE_SYSTEM_PROCESSES=System Processes
-FEATURE_SYSTEM_MEMORY=System Memory
-FEATURE_SYSTEM_DISK=System Disk
-FEATURE_SYSTEM_NETWORK=System Network
-FEATURE_SYSTEM_DEVICE=System Device
+FEATURE_NETWORK=Network Analysis
+FEATURE_OPENGL=OpenGL ES Analysis
+FEATURE_SYSTEM=System
+#FEATURE_SYSTEM_CPU=System CPU
+#FEATURE_SYSTEM_PROCESSES=System Processes
+#FEATURE_SYSTEM_MEMORY=System Memory
+#FEATURE_SYSTEM_DISK=System Disk
+#FEATURE_SYSTEM_NETWORK=System Network
+#FEATURE_SYSTEM_DEVICE=System Device
 FEATURE_SYSTEM_ENERGY=System Energy
 
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
index bc9f8dd..af16908 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.java
@@ -64,6 +64,10 @@ public class FilePageLabels extends NLS {
        public static String FILE_CHART_TOOLTIP_CLOSED;
        public static String FILE_CHART_TOOLTIP_OPEND;
        public static String FILE_CHART_TOOLTIP_USED;   
+       
+       public static String TIME_MS;
+       
+       
        static {
                // initialize resource bundle
                NLS.initializeMessages(BUNDLE_NAME, FilePageLabels.class);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
index 0ec30d8..d86df74 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties
@@ -31,4 +31,5 @@ FILE_CHART_TOOLTIP_CLOSED=CLOSED
 FILE_CHART_TOOLTIP_OPEND=OPEND
 FILE_CHART_TOOLTIP_USED=USED
        
+TIME_MS = ms
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.java
index 34c8e9a..9449d08 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.java
@@ -78,6 +78,8 @@ public class NetworkPageLabels extends NLS {
        public static String NETWORK_CHART_CLIENT_NAME;
        public static String NETWORK_CHART_SESSION_NAME;
        public static String NETWORK_CHART_TRANSACTION_NAME;
+       
+       public static String TIME_MS;
                        
        static {
                // initialize resource bundle

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.properties
index e23b2ae..ae538cd 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/NetworkPageLabels.properties
@@ -44,4 +44,6 @@ NETWORK_CHART_TRAFFIC_RECV=recv
 NETWORK_CHART_SERVER_NAME=Server\n
 NETWORK_CHART_CLIENT_NAME=Client\n
 NETWORK_CHART_SESSION_NAME=Session\n
-NETWORK_CHART_TRANSACTION_NAME=Transaction\n
\ No newline at end of file
+NETWORK_CHART_TRANSACTION_NAME=Transaction\n
+
+TIME_MS = ms
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
index a581583..620927a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
@@ -3,8 +3,9 @@ USERINTERFACE_CONTROL_LIST_VIEW_NAME = Controls
 USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_0 = Class name
 USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_1 = Initializing time
 USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_2 = Terminating time
-USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_3 = PID
-USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_4 = Control type
+USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_3 = Control type
+USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_4 = PID
+
        
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_NAME = Scene Transition
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_0 = Time
@@ -16,7 +17,7 @@ USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_5 = Transition time
 
 USERINTERFACE_SNAPSHOT_VIEW_NAME = Snapshot
 
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME = UI Function Profiling
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME = Function Profiling of Tizen UI
 USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_0 = Library/function name
 USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_1 = Sum
 USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_2 = Average 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
index 6a438b8..ff32e99 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
@@ -1029,6 +1029,7 @@ public class SqlManager {
                                        columns.toString(), tableName, queryOption);
 
                        stat = conn.createStatement();
+                       System.out.println("query : "+query);
                        rs = stat.executeQuery(query);
                        if (null == rs) {
                                return null;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
index cf40bd4..fbcd64b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
@@ -65,8 +65,8 @@ public class FileApiListView extends DAView {
                        FilePageLabels.FILE_API_LIST_VIEW_ERRNO };
 
        private int[] columnSizes = { 40, 70, 70, 70, 120, 250, 70, 70, 100 };
-       private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
-                       SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT };
+       private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT,
+                       SWT.LEFT, SWT.LEFT, SWT.RIGHT, SWT.LEFT, SWT.LEFT };
 
        int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java
index 721f162..299134b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java
@@ -146,8 +146,8 @@ public class FileDetailInfoView extends DAView {
                                                FilePageLabels.FILE_DETAILS_WRITE_SIZE
                                                                + Long.toString(writeSize), x, y += fontHeight);
                                e.gc.drawString(FilePageLabels.FILE_DETAILS_TOTAL_USE_TIME
-                                               + Formatter.toTimeFormat(totalUseTime), x,
-                                               y += fontHeight);
+                                               + Formatter.toTimeFormat(totalUseTime)
+                                               + FilePageLabels.TIME_MS, x, y += fontHeight);
                                e.gc.drawString(
                                                FilePageLabels.FILE_DETAILS_API_COUNT
                                                                + Integer.toString(apiCount), x,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java
index 3199b0a..d978355 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java
@@ -69,9 +69,9 @@ public class NetworkApiListView extends DAView {
                        NetworkPageLabels.NETWORK_API_LIST_VIEW_ERRNO };
 
        private int[] columnSizes = { 40, 70, 70, 70, 120, 90, 250, 70, 70, 70, 100, 100};
-       private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
-                       SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
-                       SWT.LEFT, SWT.LEFT };
+       private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT,
+                       SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.RIGHT, SWT.LEFT, SWT.RIGHT,
+                       SWT.RIGHT, SWT.LEFT };
 
        int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java
index 0ad3595..05d076c 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java
@@ -169,13 +169,14 @@ public class NetworkDetailInfoView extends DAView {
                }
 
                String detailAddress = selectData.getAddress();
-               detailAddress = detailAddress.replace(CommonConstants.NEW_LINE, CommonConstants.COLON);
-               
+               detailAddress = detailAddress.replace(CommonConstants.NEW_LINE,
+                               CommonConstants.COLON);
+
                StringBuffer strDetailView = new StringBuffer();
                strDetailView.append(heightFormAttachment);
                strDetailView.append(leftFormAttachment
-                               + NetworkPageLabels.NETWORK_DETAILS_ADDRESS
-                               + detailAddress + heightFormAttachment);
+                               + NetworkPageLabels.NETWORK_DETAILS_ADDRESS + detailAddress
+                               + heightFormAttachment);
                strDetailView.append(leftFormAttachment
                                + NetworkPageLabels.NETWORK_DETAILS_RECV_SIZE
                                + selectData.getRecvSize() + heightFormAttachment);
@@ -185,7 +186,8 @@ public class NetworkDetailInfoView extends DAView {
                strDetailView.append(leftFormAttachment
                                + NetworkPageLabels.NETWORK_DETAILS_TOTAL_USE_TIME
                                + Formatter.toTimeFormat(Long.toString((long) selectData
-                                               .getTotalUseTime())) + heightFormAttachment);
+                                               .getTotalUseTime())) + NetworkPageLabels.TIME_MS
+                               + heightFormAttachment);
                strDetailView.append(leftFormAttachment
                                + NetworkPageLabels.NETWORK_DETAILS_API_COUNT
                                + selectData.getApiCount() + heightFormAttachment);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
index 7add40e..b673f74 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java
@@ -161,35 +161,40 @@ public class ConfigureManager {
                                        Integer.toString(AnalyzerConstants.FEATURE_RECORDING));
                }
 
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_FILE,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_FILE));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_IPC,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_IPC));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_PROCESS,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_PROCESS));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_SIGNAL,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_SIGNAL));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_NETWORK,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_NETWORK));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                       data.put(ConfigureLabels.FEATURE_SYSCALL_DESC,
-                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_DESC));
-               }
+               if (null == data.get(ConfigureLabels.FEATURE_SYSCALL)) {
+                       data.put(ConfigureLabels.FEATURE_SYSCALL,
+                                       Integer.toString(AnalyzerConstants.FEATURE_SYSCALL));
+               }
+               
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_FILE,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_FILE));
+//             }
+//
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_IPC,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_IPC));
+//             }
+//
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_PROCESS,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_PROCESS));
+//             }
+//
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_SIGNAL,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_SIGNAL));
+//             }
+//
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_NETWORK,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_NETWORK));
+//             }
+//
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSCALL_DESC,
+//                                     Integer.toString(AnalyzerConstants.FEATURE_SYSCALL_DESC));
+//             }
 
                if (null == data.get(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                        data.put(ConfigureLabels.FEATURE_CONTEXT_SWITCH, Integer
@@ -206,39 +211,48 @@ public class ConfigureManager {
                                        Integer.toString(AnalyzerConstants.FEATURE_OPENGL_API));
                }
 
-               if (null == data.get(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
-                       data.put(ConfigureLabels.FEATURE_FUNCTION_SAMPLING, Integer
-                                       .toString(AnalyzerConstants.FEATURE_FUNCTION_SAMPLING));
-               }
-
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_CPU,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_CPU));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_PROCESSES));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_MEMORY,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_MEMORY));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_DISK,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_DISK));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_NETWORK));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_DEVICE,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_DEVICE));
-               }
-               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
-                       data.put(ConfigureLabels.FEATURE_SYSTEM_ENERGY,
-                                       Integer.toString(AnalyzerConstants.SYSTEM_ENERGY));
-               }
+//             if (null == data.get(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                     data.put(ConfigureLabels.FEATURE_FUNCTION_SAMPLING, Integer
+//                                     .toString(AnalyzerConstants.FEATURE_FUNCTION_SAMPLING));
+//             }
+
+               if (null == data.get(ConfigureLabels.FEATURE_SYSTEM)) {
+                       data.put(ConfigureLabels.FEATURE_SYSTEM,
+                                       Integer.toString(AnalyzerConstants.SYSTEM));
+               }
+               
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_CPU,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_CPU));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_CPU,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_CPU));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_PROCESSES));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_MEMORY,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_MEMORY));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_DISK,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_DISK));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_NETWORK,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_NETWORK));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_DEVICE,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_DEVICE));
+//             }
+//             if (null == data.get(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
+//                     data.put(ConfigureLabels.FEATURE_SYSTEM_ENERGY,
+//                                     Integer.toString(AnalyzerConstants.SYSTEM_ENERGY));
+//             }
 
                if (null == data.get(ConfigureLabels.THEME)) {
                        data.put(ConfigureLabels.THEME, DEFAULT_THEME);
@@ -385,22 +399,24 @@ public class ConfigureManager {
                state |= getValueInt(ConfigureLabels.FEATURE_RECORDING);
 
                if (DACommunicator.isSWAPVersion(devInfo)) {
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_FILE);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_IPC);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_PROCESS);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_SIGNAL);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_NETWORK);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_DESC);
+                       state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_FILE);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_IPC);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_PROCESS);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_SIGNAL);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_NETWORK);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSCALL_DESC);
                        state |= getValueInt(ConfigureLabels.FEATURE_CONTEXT_SWITCH);
                        state |= getValueInt(ConfigureLabels.FEATURE_NETWORK);
                        state |= getValueInt(ConfigureLabels.FEATURE_OPENGL);
-                       state |= getValueInt(ConfigureLabels.FEATURE_FUNCTION_SAMPLING);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_CPU);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_PROCESSES);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_MEMORY);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_DISK);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_NETWORK);
-                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_DEVICE);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_FUNCTION_SAMPLING);
+                       state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_CPU);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_PROCESSES);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_MEMORY);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_DISK);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_NETWORK);
+//                     state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_DEVICE);
                        state |= getValueInt(ConfigureLabels.FEATURE_SYSTEM_ENERGY);
                }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
index 81ca8e7..db0e9e3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
@@ -47,24 +47,26 @@ public class ConfigurationDialogValues {
        private int userEvent = AnalyzerConstants.FEATURE_USER_EVENT;
        private int recording = AnalyzerConstants.FEATURE_RECORDING;
 
-       private int syscallFile = AnalyzerConstants.FEATURE_OFF;
-       private int syscallIPC = AnalyzerConstants.FEATURE_OFF;
-       private int syscallProcess = AnalyzerConstants.FEATURE_OFF;
-       private int syscallSignal = AnalyzerConstants.FEATURE_OFF;
-       private int syscallNetwork = AnalyzerConstants.FEATURE_OFF;
-       private int syscallDesc = AnalyzerConstants.FEATURE_OFF;
+       private int syscall = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallFile = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallIPC = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallProcess = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallSignal = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallNetwork = AnalyzerConstants.FEATURE_OFF;
+//     private int syscallDesc = AnalyzerConstants.FEATURE_OFF;
 
        private int contextSwitch = AnalyzerConstants.FEATURE_OFF;
        private int network = AnalyzerConstants.FEATURE_OFF;
        private int openGL = AnalyzerConstants.FEATURE_OFF;
        private int sampling = AnalyzerConstants.FEATURE_OFF;
 
-       private int systemCpu = AnalyzerConstants.SYSTEM_CPU;
-       private int systemProcesses = AnalyzerConstants.SYSTEM_PROCESSES;
-       private int systemMemory = AnalyzerConstants.SYSTEM_MEMORY;
-       private int systemDisk = AnalyzerConstants.SYSTEM_DISK;
-       private int systemNetwork = AnalyzerConstants.SYSTEM_NETWORK;
-       private int systemDevice = AnalyzerConstants.SYSTEM_DEVICE;
+       private int system = AnalyzerConstants.SYSTEM;
+//     private int systemCpu = AnalyzerConstants.SYSTEM_CPU;
+//     private int systemProcesses = AnalyzerConstants.SYSTEM_PROCESSES;
+//     private int systemMemory = AnalyzerConstants.SYSTEM_MEMORY;
+//     private int systemDisk = AnalyzerConstants.SYSTEM_DISK;
+//     private int systemNetwork = AnalyzerConstants.SYSTEM_NETWORK;
+//     private int systemDevice = AnalyzerConstants.SYSTEM_DEVICE;
        private int systemEnergy = AnalyzerConstants.SYSTEM_ENERGY;
 
        // Configuration
@@ -89,20 +91,21 @@ public class ConfigurationDialogValues {
                                        ConfigureLabels.FEATURE_NETWORK,
                                        ConfigureLabels.FEATURE_OPENGL,
                                        ConfigureLabels.FEATURE_RECORDING,
-                                       ConfigureLabels.FEATURE_SYSCALL_FILE,
-                                       ConfigureLabels.FEATURE_SYSCALL_IPC,
-                                       ConfigureLabels.FEATURE_SYSCALL_PROCESS,
-                                       ConfigureLabels.FEATURE_SYSCALL_SIGNAL,
-                                       ConfigureLabels.FEATURE_SYSCALL_NETWORK,
-                                       ConfigureLabels.FEATURE_SYSCALL_DESC,
+                                       ConfigureLabels.FEATURE_SYSCALL,
+//                                     ConfigureLabels.FEATURE_SYSCALL_FILE,
+//                                     ConfigureLabels.FEATURE_SYSCALL_IPC,
+//                                     ConfigureLabels.FEATURE_SYSCALL_PROCESS,
+//                                     ConfigureLabels.FEATURE_SYSCALL_SIGNAL,
+//                                     ConfigureLabels.FEATURE_SYSCALL_NETWORK,
+//                                     ConfigureLabels.FEATURE_SYSCALL_DESC,
                                        ConfigureLabels.FEATURE_CONTEXT_SWITCH,
-                                       ConfigureLabels.FEATURE_FUNCTION_SAMPLING,
-                                       ConfigureLabels.FEATURE_SYSTEM_CPU,
-                                       ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
-                                       ConfigureLabels.FEATURE_SYSTEM_MEMORY,
-                                       ConfigureLabels.FEATURE_SYSTEM_DISK,
-                                       ConfigureLabels.FEATURE_SYSTEM_NETWORK,
-                                       ConfigureLabels.FEATURE_SYSTEM_DEVICE,
+                                       ConfigureLabels.FEATURE_SYSTEM,
+//                                     ConfigureLabels.FEATURE_SYSTEM_CPU,
+//                                     ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
+//                                     ConfigureLabels.FEATURE_SYSTEM_MEMORY,
+//                                     ConfigureLabels.FEATURE_SYSTEM_DISK,
+//                                     ConfigureLabels.FEATURE_SYSTEM_NETWORK,
+//                                     ConfigureLabels.FEATURE_SYSTEM_DEVICE,
                                        ConfigureLabels.FEATURE_SYSTEM_ENERGY };
                        mConfig = ConfigureManager.getInstance();
                }
@@ -140,53 +143,65 @@ public class ConfigurationDialogValues {
                                } else if (featureName
                                                .equals(ConfigureLabels.FEATURE_RECORDING)) {
                                        return getRecording();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                                       return getSyscallFile();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                                       return getSyscallIPC();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                                       return getSyscallProcess();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                                       return getSyscallSignal();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                                       return getSyscallNetwork();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                                       return getSyscallDesc();
-                               } else if (featureName
+                               }else if (featureName
+                                               .equals(ConfigureLabels.FEATURE_SYSCALL)) {
+                                       return getSyscall();
+                               } 
+//                             else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                                     return getSyscallFile();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                                     return getSyscallIPC();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                                     return getSyscallProcess();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                                     return getSyscallSignal();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                                     return getSyscallNetwork();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                                     return getSyscallDesc();
+//                             } 
+                               else if (featureName
                                                .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                                        return getContextSwitch();
                                } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) {
                                        return getNetwork();
                                } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) {
                                        return getOpenGL();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
-                                       return getSampling();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                                       return getSystemCpu();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                                       return getSystemProcesses();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                                       return getSystemMemory();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                                       return getSystemDisk();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                                       return getSystemNetwork();
-                               } else if (featureName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                                       return getSystemDevice();
-                               } else if (featureName
+                               } 
+//                             else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                                     return getSampling();
+//                             } 
+                               else if (featureName
+                                               .equals(ConfigureLabels.FEATURE_SYSTEM)) {
+                                       return getSystem();
+                               }
+//                             else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                                     return getSystemCpu();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                                     return getSystemProcesses();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                                     return getSystemMemory();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                                     return getSystemDisk();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                                     return getSystemNetwork();
+//                             } else if (featureName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                                     return getSystemDevice();
+//                             } 
+                               else if (featureName
                                                .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
                                        return getSystemEnergy();
                                } else {
@@ -247,43 +262,53 @@ public class ConfigurationDialogValues {
                                                value = AnalyzerConstants.FEATURE_RECORDING;
                                        }
                                        setRecording(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_FILE;
-                                       }
-                                       setSyscallFile(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_IPC;
-                                       }
-                                       setSyscallIPC(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_PROCESS;
-                                       }
-                                       setSyscallProcess(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_SIGNAL;
-                                       }
-                                       setSyscallSignal(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_NETWORK;
-                                       }
-                                       setSyscallNetwork(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.FEATURE_SYSCALL_DESC;
+                               }
+                                else if (featueName
+                                                       .equals(ConfigureLabels.FEATURE_SYSCALL)) {
+                                               if (status) {
+                                                       value = AnalyzerConstants.FEATURE_SYSCALL;
+                                               }
+                                               setSyscall(value);
                                        }
-                                       setSyscallDesc(value);
-                               } else if (featueName
+                               
+//                             else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_FILE;
+//                                     }
+//                                     setSyscallFile(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_IPC;
+//                                     }
+//                                     setSyscallIPC(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_PROCESS;
+//                                     }
+//                                     setSyscallProcess(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_SIGNAL;
+//                                     }
+//                                     setSyscallSignal(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_NETWORK;
+//                                     }
+//                                     setSyscallNetwork(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_SYSCALL_DESC;
+//                                     }
+//                                     setSyscallDesc(value);
+//                             } 
+                               else if (featueName
                                                .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                                        if (status) {
                                                value = AnalyzerConstants.FEATURE_CONTEXT_SWITCHING;
@@ -299,49 +324,60 @@ public class ConfigurationDialogValues {
                                                value = AnalyzerConstants.FEATURE_OPENGL_API;
                                        }
                                        setOpenGL(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+                               } 
+//                             else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.FEATURE_FUNCTION_SAMPLING;
+//                                     }
+//                                     setSampling(value);
+//                             } 
+                               else if (featueName
+                                               .equals(ConfigureLabels.FEATURE_SYSTEM)) {
                                        if (status) {
-                                               value = AnalyzerConstants.FEATURE_FUNCTION_SAMPLING;
+                                               value = AnalyzerConstants.SYSTEM;
                                        }
-                                       setSampling(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_CPU;
-                                       }
-                                       setSystemCpu(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_PROCESSES;
-                                       }
-                                       setSystemProcesses(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_MEMORY;
-                                       }
-                                       setSystemMemory(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_DISK;
-                                       }
-                                       setSystemDisk(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_NETWORK;
-                                       }
-                                       setSystemNetwork(value);
-                               } else if (featueName
-                                               .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                                       if (status) {
-                                               value = AnalyzerConstants.SYSTEM_DEVICE;
-                                       }
-                                       setSystemDevice(value);
-                               } else if (featueName
+                                       setSystem(value);
+                               } 
+//                             else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_CPU;
+//                                     }
+//                                     setSystemCpu(value);
+//                             } 
+//                             else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_PROCESSES;
+//                                     }
+//                                     setSystemProcesses(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_MEMORY;
+//                                     }
+//                                     setSystemMemory(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_DISK;
+//                                     }
+//                                     setSystemDisk(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_NETWORK;
+//                                     }
+//                                     setSystemNetwork(value);
+//                             } else if (featueName
+//                                             .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                                     if (status) {
+//                                             value = AnalyzerConstants.SYSTEM_DEVICE;
+//                                     }
+//                                     setSystemDevice(value);
+//                             } 
+                               else if (featueName
                                                .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
                                        if (status) {
                                                value = AnalyzerConstants.SYSTEM_ENERGY;
@@ -385,48 +421,60 @@ public class ConfigurationDialogValues {
                                setUserEvent(featuresStatus);
                        } else if (featureName.equals(ConfigureLabels.FEATURE_RECORDING)) {
                                setRecording(featuresStatus);
-                       } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                               setSyscallFile(featuresStatus);
-                       } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                               setSyscallIPC(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                               setSyscallProcess(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                               setSyscallSignal(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                               setSyscallNetwork(featuresStatus);
-                       } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                               setSyscallDesc(featuresStatus);
-                       } else if (featureName
+                       }
+                       else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL)) {
+                               setSyscall(featuresStatus);
+                       }
+//                     else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                             setSyscallFile(featuresStatus);
+//                     } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                             setSyscallIPC(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                             setSyscallProcess(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                             setSyscallSignal(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                             setSyscallNetwork(featuresStatus);
+//                     } else if (featureName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                             setSyscallDesc(featuresStatus);
+//                     }
+                       else if (featureName
                                        .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                                setContextSwitch(featuresStatus);
                        } else if (featureName.equals(ConfigureLabels.FEATURE_NETWORK)) {
                                setNetwork(featuresStatus);
                        } else if (featureName.equals(ConfigureLabels.FEATURE_OPENGL)) {
                                setOpenGL(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
-                               setSampling(featuresStatus);
-                       } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                               setSystemCpu(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                               setSystemProcesses(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                               setSystemMemory(featuresStatus);
-                       } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                               setSystemDisk(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                               setSystemNetwork(featuresStatus);
-                       } else if (featureName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                               setSystemDevice(featuresStatus);
-                       } else if (featureName
+                       } 
+//                     else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                             setSampling(featuresStatus);
+//                     }
+                       else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM)) {
+                               setSystem(featuresStatus);
+                       }
+//                     else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                             setSystemCpu(featuresStatus);
+//                     }
+//                     else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                             setSystemProcesses(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                             setSystemMemory(featuresStatus);
+//                     } else if (featureName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                             setSystemDisk(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                             setSystemNetwork(featuresStatus);
+//                     } else if (featureName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                             setSystemDevice(featuresStatus);
+//                     } 
+                       else if (featureName
                                        .equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
                                setSystemEnergy(featuresStatus);
                        } else {
@@ -492,50 +540,56 @@ public class ConfigurationDialogValues {
                                setConfig(getUserEvent(), featueName);
                        } else if (featueName.equals(ConfigureLabels.FEATURE_RECORDING)) {
                                setConfig(getRecording(), featueName);
+                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) {
+                               setConfig(getSyscall(), featueName);
                        }
-
-                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                               setConfig(getSyscallFile(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                               setConfig(getSyscallIPC(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                               setConfig(getSyscallProcess(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                               setConfig(getSyscallSignal(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                               setConfig(getSyscallNetwork(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                               setConfig(getSyscallDesc(), featueName);
-                       } else if (featueName
+//                     else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                             setConfig(getSyscallFile(), featueName);
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                             setConfig(getSyscallIPC(), featueName);
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                             setConfig(getSyscallProcess(), featueName);
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                             setConfig(getSyscallSignal(), featueName);
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                             setConfig(getSyscallNetwork(), featueName);
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                             setConfig(getSyscallDesc(), featueName);
+//                     }
+                       else if (featueName
                                        .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                                setConfig(getContextSwitch(), featueName);
                        } else if (featueName.equals(ConfigureLabels.FEATURE_NETWORK)) {
                                setConfig(getNetwork(), featueName);
                        } else if (featueName.equals(ConfigureLabels.FEATURE_OPENGL)) {
                                setConfig(getOpenGL(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
-                               setConfig(getSampling(), featueName);
+                       } 
+//                     else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                             setConfig(getSampling(), featueName);
+//                     }
+                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) {
+                               setConfig(getSystem(), featueName);
                        }
-
-                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                               setConfig(getSystemCpu(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                               setConfig(getSystemProcesses(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                               setConfig(getSystemMemory(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                               setConfig(getSystemDisk(), featueName);
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                               setConfig(getSystemNetwork(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                               setConfig(getSystemDevice(), featueName);
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
+//                     else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                             setConfig(getSystemCpu(), featueName);
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                             setConfig(getSystemProcesses(), featueName);
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                             setConfig(getSystemMemory(), featueName);
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                             setConfig(getSystemDisk(), featueName);
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                             setConfig(getSystemNetwork(), featueName);
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                             setConfig(getSystemDevice(), featueName);
+//                     }
+                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
                                setConfig(getSystemEnergy(), featueName);
                        } else {
                                System.out.println("failed undefine features");
@@ -612,34 +666,41 @@ public class ConfigurationDialogValues {
                                                        + " to " + getRecording());
                                }
                        }
-                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
-                               if (isChangeFeatuesValues(getSyscallFile(), featueName)) {
-                                       System.out.println("change values syscall file");
-                               }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
-                               if (isChangeFeatuesValues(getSyscallIPC(), featueName)) {
-                                       System.out.println("change values syscall ipc");
-                               }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
-                               if (isChangeFeatuesValues(getSyscallProcess(), featueName)) {
-                                       System.out.println("change values syscall process");
-                               }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
-                               if (isChangeFeatuesValues(getSyscallSignal(), featueName)) {
-                                       System.out.println("change values syscall signal");
-                               }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
-                               if (isChangeFeatuesValues(getSyscallNetwork(), featueName)) {
-                                       System.out.println("change values syscall network");
+                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL)) {
+                               if (isChangeFeatuesValues(getSyscall(), featueName)) {
+                                       System.out.println("change values syscall");
                                }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
-                               if (isChangeFeatuesValues(getSyscallDesc(), featueName)) {
-                                       System.out.println("change values syscall desc");
-                               }
-                       } else if (featueName
+                       }
+                       
+//                     else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_FILE)) {
+//                             if (isChangeFeatuesValues(getSyscallFile(), featueName)) {
+//                                     System.out.println("change values syscall file");
+//                             }
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_IPC)) {
+//                             if (isChangeFeatuesValues(getSyscallIPC(), featueName)) {
+//                                     System.out.println("change values syscall ipc");
+//                             }
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_PROCESS)) {
+//                             if (isChangeFeatuesValues(getSyscallProcess(), featueName)) {
+//                                     System.out.println("change values syscall process");
+//                             }
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_SIGNAL)) {
+//                             if (isChangeFeatuesValues(getSyscallSignal(), featueName)) {
+//                                     System.out.println("change values syscall signal");
+//                             }
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSCALL_NETWORK)) {
+//                             if (isChangeFeatuesValues(getSyscallNetwork(), featueName)) {
+//                                     System.out.println("change values syscall network");
+//                             }
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSCALL_DESC)) {
+//                             if (isChangeFeatuesValues(getSyscallDesc(), featueName)) {
+//                                     System.out.println("change values syscall desc");
+//                             }
+//                     } 
+                       else if (featueName
                                        .equals(ConfigureLabels.FEATURE_CONTEXT_SWITCH)) {
                                if (isChangeFeatuesValues(getContextSwitch(), featueName)) {
                                        System.out.println("change values context switch");
@@ -652,39 +713,46 @@ public class ConfigurationDialogValues {
                                if (isChangeFeatuesValues(getOpenGL(), featueName)) {
                                        System.out.println("change values open GL");
                                }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
-                               if (isChangeFeatuesValues(getSampling(), featueName)) {
-                                       System.out.println("change values sampling");
+                       } 
+//                     else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_FUNCTION_SAMPLING)) {
+//                             if (isChangeFeatuesValues(getSampling(), featueName)) {
+//                                     System.out.println("change values sampling");
+//                             }
+//                     }
+                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM)) {
+                               if (isChangeFeatuesValues(getSystem(), featueName)) {
+                                       System.out.println("change values system");
                                }
                        }
-                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
-                               if (isChangeFeatuesValues(getSystemCpu(), featueName)) {
-                                       System.out.println("change values system cpu");
-                               }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
-                               if (isChangeFeatuesValues(getSystemProcesses(), featueName)) {
-                                       System.out.println("change values system processes");
-                               }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
-                               if (isChangeFeatuesValues(getSystemMemory(), featueName)) {
-                                       System.out.println("change values system memory");
-                               }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
-                               if (isChangeFeatuesValues(getSystemDisk(), featueName)) {
-                                       System.out.println("change values system disk");
-                               }
-                       } else if (featueName
-                                       .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
-                               if (isChangeFeatuesValues(getSystemNetwork(), featueName)) {
-                                       System.out.println("change values system network");
-                               }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
-                               if (isChangeFeatuesValues(getSystemDevice(), featueName)) {
-                                       System.out.println("change values system device");
-                               }
-                       } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
+//                     else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_CPU)) {
+//                             if (isChangeFeatuesValues(getSystemCpu(), featueName)) {
+//                                     System.out.println("change values system cpu");
+//                             }
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_PROCESSES)) {
+//                             if (isChangeFeatuesValues(getSystemProcesses(), featueName)) {
+//                                     System.out.println("change values system processes");
+//                             }
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_MEMORY)) {
+//                             if (isChangeFeatuesValues(getSystemMemory(), featueName)) {
+//                                     System.out.println("change values system memory");
+//                             }
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DISK)) {
+//                             if (isChangeFeatuesValues(getSystemDisk(), featueName)) {
+//                                     System.out.println("change values system disk");
+//                             }
+//                     } else if (featueName
+//                                     .equals(ConfigureLabels.FEATURE_SYSTEM_NETWORK)) {
+//                             if (isChangeFeatuesValues(getSystemNetwork(), featueName)) {
+//                                     System.out.println("change values system network");
+//                             }
+//                     } else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE)) {
+//                             if (isChangeFeatuesValues(getSystemDevice(), featueName)) {
+//                                     System.out.println("change values system device");
+//                             }
+//                     }
+                       else if (featueName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) {
                                if (isChangeFeatuesValues(getSystemEnergy(), featueName)) {
                                        System.out.println("change values system energy");
                                }
@@ -717,54 +785,60 @@ public class ConfigurationDialogValues {
        public void setAutoStop(boolean autoStop) {
                this.autoStop = autoStop;
        }
-
-       public int getSyscallFile() {
-               return syscallFile;
-       }
-
-       public void setSyscallFile(int syscallFile) {
-               this.syscallFile = syscallFile;
-       }
-
-       public int getSyscallIPC() {
-               return syscallIPC;
-       }
-
-       public void setSyscallIPC(int syscallIPC) {
-               this.syscallIPC = syscallIPC;
-       }
-
-       public int getSyscallProcess() {
-               return syscallProcess;
-       }
-
-       public void setSyscallProcess(int syscallProcess) {
-               this.syscallProcess = syscallProcess;
-       }
-
-       public int getSyscallSignal() {
-               return syscallSignal;
-       }
-
-       public void setSyscallSignal(int syscallSignal) {
-               this.syscallSignal = syscallSignal;
-       }
-
-       public int getSyscallNetwork() {
-               return syscallNetwork;
-       }
-
-       public void setSyscallNetwork(int syscallNetwork) {
-               this.syscallNetwork = syscallNetwork;
-       }
-
-       public int getSyscallDesc() {
-               return syscallDesc;
-       }
-
-       public void setSyscallDesc(int syscallDesc) {
-               this.syscallDesc = syscallDesc;
-       }
+       public int getSyscall() {
+               return syscall;
+       }
+       public void setSyscall(int syscall) {
+               this.syscall = syscall;
+       }
+       
+//     public int getSyscallFile() {
+//             return syscallFile;
+//     }
+//
+//     public void setSyscallFile(int syscallFile) {
+//             this.syscallFile = syscallFile;
+//     }
+//
+//     public int getSyscallIPC() {
+//             return syscallIPC;
+//     }
+//
+//     public void setSyscallIPC(int syscallIPC) {
+//             this.syscallIPC = syscallIPC;
+//     }
+//
+//     public int getSyscallProcess() {
+//             return syscallProcess;
+//     }
+//
+//     public void setSyscallProcess(int syscallProcess) {
+//             this.syscallProcess = syscallProcess;
+//     }
+//
+//     public int getSyscallSignal() {
+//             return syscallSignal;
+//     }
+//
+//     public void setSyscallSignal(int syscallSignal) {
+//             this.syscallSignal = syscallSignal;
+//     }
+//
+//     public int getSyscallNetwork() {
+//             return syscallNetwork;
+//     }
+//
+//     public void setSyscallNetwork(int syscallNetwork) {
+//             this.syscallNetwork = syscallNetwork;
+//     }
+//
+//     public int getSyscallDesc() {
+//             return syscallDesc;
+//     }
+//
+//     public void setSyscallDesc(int syscallDesc) {
+//             this.syscallDesc = syscallDesc;
+//     }
 
        public int getContextSwitch() {
                return contextSwitch;
@@ -862,54 +936,62 @@ public class ConfigurationDialogValues {
                this.recording = recording;
        }
 
-       public int getSystemCpu() {
-               return systemCpu;
-       }
-
-       public void setSystemCpu(int systemCpu) {
-               this.systemCpu = systemCpu;
-       }
-
-       public int getSystemProcesses() {
-               return systemProcesses;
-       }
-
-       public void setSystemProcesses(int systemProcesses) {
-               this.systemProcesses = systemProcesses;
-       }
-
-       public int getSystemMemory() {
-               return systemMemory;
-       }
-
-       public void setSystemMemory(int systemMemory) {
-               this.systemMemory = systemMemory;
-       }
-
-       public int getSystemDisk() {
-               return systemDisk;
-       }
-
-       public void setSystemDisk(int systemDisk) {
-               this.systemDisk = systemDisk;
-       }
-
-       public int getSystemNetwork() {
-               return systemNetwork;
-       }
-
-       public void setSystemNetwork(int systemNetwork) {
-               this.systemNetwork = systemNetwork;
-       }
-
-       public int getSystemDevice() {
-               return systemDevice;
-       }
-
-       public void setSystemDevice(int systemDevice) {
-               this.systemDevice = systemDevice;
-       }
-
+       public int getSystem() {
+               return system;
+       }
+
+       public void setSystem(int system) {
+               this.system = system;
+       }
+       
+//     public int getSystemCpu() {
+//             return systemCpu;
+//     }
+//
+//     public void setSystemCpu(int systemCpu) {
+//             this.systemCpu = systemCpu;
+//     }
+//     
+//     public int getSystemProcesses() {
+//             return systemProcesses;
+//     }
+//
+//     public void setSystemProcesses(int systemProcesses) {
+//             this.systemProcesses = systemProcesses;
+//     }
+//
+//     public int getSystemMemory() {
+//             return systemMemory;
+//     }
+//
+//     public void setSystemMemory(int systemMemory) {
+//             this.systemMemory = systemMemory;
+//     }
+//
+//     public int getSystemDisk() {
+//             return systemDisk;
+//     }
+//
+//     public void setSystemDisk(int systemDisk) {
+//             this.systemDisk = systemDisk;
+//     }
+//
+//     public int getSystemNetwork() {
+//             return systemNetwork;
+//     }
+//
+//     public void setSystemNetwork(int systemNetwork) {
+//             this.systemNetwork = systemNetwork;
+//     }
+//
+//     public int getSystemDevice() {
+//             return systemDevice;
+//     }
+//
+//     public void setSystemDevice(int systemDevice) {
+//             this.systemDevice = systemDevice;
+//     }
+//
        public int getSystemEnergy() {
                return systemEnergy;
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java
index 600dacd..9fb9bc6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java
@@ -205,8 +205,8 @@ public class UIControlListTable extends DATreeComposite {
                text.add(input.getChildClassName());
                text.add(input.getInitializeTime());
                text.add(input.getTerminateTime());
-               text.add(input.getPID());
                text.add(input.getControlType());
+               text.add(input.getPID());
 
                TreeInput output = new TreeInput();
                output.setText(text);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java
index b41c353..c472814 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java
@@ -57,10 +57,12 @@ public class UIControlListView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_2,
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_3,
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_4 };
-       private int[] columnSizes = { 250, 110, 110, 70, 100 };
+       private int[] columnSizes = { 250, 110, 110, 100, 70 };
 
        UIControlListTable treeComp = null;
        private boolean[] columnVisibility = { true, true, true, true, true, true };
+       private int[] columnAlignment = { SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.LEFT,
+                       SWT.RIGHT};
        int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NONE,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM };
@@ -84,6 +86,7 @@ public class UIControlListView extends DAView {
                treeComp.setTableName(UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_NAME);
                treeComp.setTree(true);
                treeComp.setSortTypes(sortTypes);
+               treeComp.setColumnAlignment(columnAlignment);
                treeComp.setColumns(columnNames);
                treeComp.setColumnSize(columnSizes);
                treeComp.setColumnVisibility(columnVisibility);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
index 502e109..f649858 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
@@ -63,6 +63,8 @@ public class UIFunctionProfilingView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7,
                        UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 };
        private int[] columnSizes = { 355, 80, 80, 80, 80, 80, 80, 80, 80 };
+       private int[] columnAlignment = { SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT,
+                       SWT.RIGHT,SWT.RIGHT,SWT.RIGHT,SWT.RIGHT,SWT.RIGHT};
        UIFunctionProfilingTable treeComp = null;
        private boolean[] columnVisibility = { true, true, true, true, true, true,
                        true, true, true };
@@ -88,6 +90,7 @@ public class UIFunctionProfilingView extends DAView {
                /*** setTree set first!!! ***/
                treeComp.setTree(true);
                treeComp.setSortTypes(sortTypes);
+               treeComp.setColumnAlignment(columnAlignment);
                createColumnData();
                treeComp.setColumns(columnData);
                // treeComp.setColumns(columnNames);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java
index 7696a8c..bb94d9f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java
@@ -49,6 +49,8 @@ public class UISceneListView extends DAView {
        int[] outerMaxWeight = { 100, 0 };
        private int[] columnSizes = { 70,70, 120, 120, 120, 120 };
        private boolean[] columnVisibility = { true, true, true, true, true };
+       private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.LEFT, SWT.LEFT,
+                       SWT.LEFT,SWT.RIGHT};
 
        private String[] columnNames = {
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_0,
@@ -81,6 +83,7 @@ public class UISceneListView extends DAView {
                tableComp
                                .setTableName(UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_NAME);
                tableComp.setSortTypes(sortTypes);
+               tableComp.setColumnAlignment(columnAlignment);
                tableComp.setColumns(columnNames);
                tableComp.setColumnSize(columnSizes);
                tableComp.setColumnVisibility(columnVisibility);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableCellRenderer.java
index a2214be..ec0d334 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableCellRenderer.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableCellRenderer.java
@@ -166,10 +166,10 @@ public class DATableCellRenderer extends DefaultCellRenderer {
                }
 
                gc.setFont(FontResources.TABLE_CELL_FONT);
-               if (!isTree() || getColumn() != 0) {
+       //      if (getColumn() != 0) {
                        gc.drawText(text, getBounds().x + x, getBounds().y + textTopMargin,
                                        true);
-               }
+       //      }
 
                if (item.getParent().getLinesVisible()) {
                        if (isCellSelected()) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java
index 626004e..79d302a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java
@@ -259,7 +259,7 @@ public abstract class DATableComposite extends Composite {
                        column.setCellRenderer(new DATableCellRenderer());
                        column.setHeaderRenderer(new DATableHeaderRenderer());
 
-                       if (isTree == false && columnAlignment != null) {
+                       if (columnAlignment != null) {
                                if (columnAlignment.length > i) {
                                        column.setAlignment(columnAlignment[i]);
                                }