[Title] change configuration features order

[Desc.] set features list order
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
index db6916f..525b068 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java
@@ -54,6 +54,19 @@ public class ConfigurationDialogDataManager {
                if (null == instance) {
                        instance = new ConfigurationDialogDataManager();
                        tableFeaturesName = new String[] {
+                               
+                                       ConfigureLabels.FEATURE_FILE,
+                                       ConfigureLabels.FEATURE_THREAD,
+                                       ConfigureLabels.FEATURE_USERINTERFACE,
+                                       ConfigureLabels.FEATURE_OPENGL,
+                                       ConfigureLabels.FEATURE_NETWORK,
+                                       ConfigureLabels.FEATURE_MEMORY_ALLOCATION,
+                                       ConfigureLabels.FEATURE_SCREENSHOT,
+                                       ConfigureLabels.FEATURE_USER_EVENT,
+                                       ConfigureLabels.FEATURE_RECORDING,
+                                       ConfigureLabels.FEATURE_FUNCTION_PROFILING,
+                                       ConfigureLabels.FEATURE_CONTEXT_SWITCH,
+
                                        ConfigureLabels.FEATURE_SYSTEM_CPU,
                                        ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
                                        ConfigureLabels.FEATURE_SYSTEM_MEMORY,
@@ -61,29 +74,22 @@ public class ConfigurationDialogDataManager {
                                        ConfigureLabels.FEATURE_SYSTEM_NETWORK,
                                        ConfigureLabels.FEATURE_SYSTEM_DEVICE,
                                        ConfigureLabels.FEATURE_SYSTEM_ENERGY,
-                                       ConfigureLabels.FEATURE_FUNCTION_PROFILING,
-                                       ConfigureLabels.FEATURE_MEMORY_ALLOCATION,
-                                       ConfigureLabels.FEATURE_FILE,
-                                       ConfigureLabels.FEATURE_THREAD,
-                                       ConfigureLabels.FEATURE_USERINTERFACE,
-                                       ConfigureLabels.FEATURE_SCREENSHOT,
-                                       ConfigureLabels.FEATURE_USER_EVENT,
-                                       ConfigureLabels.FEATURE_RECORDING,
-                                       ConfigureLabels.FEATURE_OPENGL,
-                                       ConfigureLabels.FEATURE_NETWORK,
+                                       
                                        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.INCLUDE_INSIDE_CALL_MEMORY,
                                        ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD,
                                        ConfigureLabels.INCLUDE_INSIDE_CALL_FILE,
                                        ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK,
                                        ConfigureLabels.INCLUDE_INSIDE_CALL_UI,
                                        ConfigureLabels.INCLUDE_INSIDE_OPENGL, };
+                       
+                       
                        optionSettingName = new String[] { ConfigureLabels.SHOW_INITIAL,
                                        ConfigureLabels.AUTO_STOP,
                                        ConfigureLabels.SNAPSHOT_PERIODIC,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
index b8ff339..92af8b0 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
@@ -50,7 +50,6 @@ import org.tizen.dynamicanalyzer.resources.FontResources;
 import org.tizen.dynamicanalyzer.ui.page.DAPageComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.DAText;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
-import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator;
 import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckBox;
 import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckboxSelectionListener;
 
@@ -105,7 +104,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite {
                                SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE);
                featuresTable.setTree(true);
                featuresTable.setTableName(ConfigureLabels.FEATURE_TABLE_TITLE);
-               featuresTable.setComparator(new DefaultTableComparator());
+               featuresTable.setComparator(new ConfigurationTableComparator());
                featuresTable.setSortTypes(sortTypes);
                featuresTable.setColumns(columnNames);
                featuresTable.setColumnSize(columnSizes);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java
index 8d8634b..8ff9358 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesTable.java
@@ -81,7 +81,7 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite {
        }
 
        private String isCheckFeatue(String featueName) {
-               if (AnalyzerConstants.FEATURE_OFF < ConfigurationDialogDataManager
+               if (AnalyzerConstants.FEATURE_OFF != ConfigurationDialogDataManager
                                .getInstance().getfeatureSwapValue(featueName)) {
                        return ITEM_ALL_CHECKED;
                } else {
@@ -111,7 +111,6 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite {
                }
 
                text.add(optionColumn);
-
                TreeInput outPut = new TreeInput();
                outPut.setText(text);
                outPut.setData(tableData);
@@ -125,6 +124,7 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite {
                                .getTableFeature();
                for (int i = 0; i < featuresList.length; i++) {
                        String featuresName = featuresList[i];
+                       System.out.println("-- featuresName : " + featuresName);
                        TreeInput currentNode = makeInput(featuresName);
                        if (!ConfigurationDialogDataManager.getInstance().HasParentfeature(
                                        featuresName)) {
@@ -229,16 +229,17 @@ public class ConfigurationDialogFeaturesTable extends DATreeComposite {
                optionValue.append(CommonConstants.SPACE).append(
                                CommonConstants.OPEN_BRACKET);
 
-               if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)
-                               || featureName
-                                               .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)
-                               || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)
-                               || featureName
-                                               .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)
-                               || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)
-                               || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) {
-                       optionValue.append(ConfigureLabels.INCLUDE_INSIDE_CALL);
-               } else if (featureName.equals(ConfigureLabels.SNAPSHOT_PERIODIC)) {
+               // if (featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)
+               // || featureName
+               // .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)
+               // || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)
+               // || featureName
+               // .equals(ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK)
+               // || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_CALL_UI)
+               // || featureName.equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) {
+               // optionValue.append(ConfigureLabels.INCLUDE_INSIDE_CALL);
+               // } else
+               if (featureName.equals(ConfigureLabels.SNAPSHOT_PERIODIC)) {
                        if (ConfigurationDialogDataManager
                                        .getInstance()
                                        .getfeatureSwapValue(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO) != AnalyzerConstants.FEATURE_OFF) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java
new file mode 100644 (file)
index 0000000..7df2c23
--- /dev/null
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationTableComparator.java
@@ -0,0 +1,44 @@
+/*
+ *  Dynamic Analyzer
+ *
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: 
+ * Jooyoul Lee <jy.exe.lee@samsung.com>
+ * Juyoung Kim <j0.kim@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * Contributors:
+ * - S-Core Co., Ltd
+ * 
+ */
+
+package org.tizen.dynamicanalyzer.ui.toolbar.configuration;
+
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
+import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator;
+
+public class ConfigurationTableComparator extends DefaultTableComparator {
+
+       private static final long serialVersionUID = 1L;
+       protected int type = AnalyzerConstants.SORT_TYPE_GRID;
+       protected int column = 0;
+       protected int oldColumn = 0;
+       protected boolean dirUp = true;
+
+       @Override
+       public int compare(Object arg0, Object arg1) {
+               return 1;
+       }
+}