[Title] improve scene table at userinterface view

[Desc.] using probe log
[Issue] redmine #7377

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/xml/scene.logc b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/xml/scene.logc
index 3a30659..83c8504 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/xml/scene.logc
+++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/xml/scene.logc
@@ -2,7 +2,7 @@
 <BaseLogCenter xmlns="org.tizen.dynamicanalyzer">
     <id>8</id>
     <name>scene</name>
-    <totalColumnCount>20</totalColumnCount>
+    <totalColumnCount>21</totalColumnCount>
     <customColumn>false</customColumn>
     
     <ColumnName>Rid</ColumnName>
@@ -23,12 +23,14 @@
     <ColumnName>SceneName</ColumnName>
     <ColumnName>FormName</ColumnName>
 
-    <ColumnName>FormPointer</ColumnName>
+    <ColumnName>FormClassName</ColumnName>
     <ColumnName>PanelName</ColumnName>
-    <ColumnName>PanelPointer</ColumnName>
-    <ColumnName>Direction</ColumnName>
+    <ColumnName>PanelClassName</ColumnName>
     <ColumnName>Reserved</ColumnName>
     
+    <ColumnName>Null1</ColumnName>
+    <ColumnName>Null2</ColumnName>
+    
     <type>INTEGER</type>
     <type>INTEGER</type>
     <type>INTEGER PRIMARY KEY NOT NULL</type>
@@ -47,10 +49,12 @@
     <type>TEXT</type>
     <type>TEXT</type>
     
-    <type>INTEGER</type>
     <type>TEXT</type>
-    <type>INTEGER</type>
-    <type>INTEGER</type>
+    <type>TEXT</type>
+    <type>TEXT</type>
+    <type>TEXT</type>
+    
+    <type>TEXT</type>
     <type>TEXT</type>
 
     <ColumnSize>100</ColumnSize>
@@ -82,6 +86,8 @@
     <ColumnOrder>17</ColumnOrder>
     <ColumnOrder>18</ColumnOrder>
     <ColumnOrder>19</ColumnOrder>
+    <ColumnOrder>20</ColumnOrder>
+   
     
     
     <ColumnVisibility>true</ColumnVisibility>
@@ -107,6 +113,8 @@
     <ColumnVisibility>true</ColumnVisibility>
     <ColumnVisibility>true</ColumnVisibility>
     <ColumnVisibility>true</ColumnVisibility>
+    <ColumnVisibility>true</ColumnVisibility>
+   
     
     
     <TableColumnName>Row Id</TableColumnName>
@@ -127,10 +135,11 @@
     <TableColumnName>Scene name</TableColumnName>
     <TableColumnName>Form name</TableColumnName>
     
-    <TableColumnName>Form pointer</TableColumnName>
+    <TableColumnName>Form Class Name</TableColumnName>
     <TableColumnName>Panel name</TableColumnName>
-    <TableColumnName>Panel pointer</TableColumnName>
-    <TableColumnName>Direction</TableColumnName>
+    <TableColumnName>Panel Class Name</TableColumnName>
     <TableColumnName>Reserved</TableColumnName>
+    <TableColumnName>Null 1</TableColumnName>
+    <TableColumnName>Null 2</TableColumnName>
     
 </BaseLogCenter>
\ 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 691ca97..214cf8d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
@@ -7,8 +7,8 @@ USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_2 = Terminating Time
 USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_3 = Control type
        
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_NAME = Scene Transforms
-USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_0 = Scene Name
-USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_1 = Time
+USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_0 = Time
+USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_1 = Scene Name
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_2 = Form Name
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_3 = Panel Name
 USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_4 = Transform Time

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java
index fb5cc82..f7fec08 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java
@@ -151,51 +151,6 @@ public class UIDataManager implements Runnable {
                setSceneTransformDataTFromLogPackage(logPack);
                setControlDataTFromLogPackage(logPack);
 
-//             // TEST LOG
-//              ////////////////////////////////////////////////
-//             if (testcode == 0) {
-//                     testcode++;
-//                     String[] testLogs = {
-//                                     "8,3601,DABadaAppForm::OnInitializing,1076601,5478,5478,0, 1, 0,17,0,0,DABadaAppForm, DABadaAppForm, 4545, -, -, 12",
-//                                     "8,3602,TestThreadForm::OnInitializing,1036602,5479,5479,0, 1, 0,17,0,0,TestThreadForm, TestThreadForm, 4546,-, -, 13",
-//                                     "8,3603,TestFilePanel::OnInitializing,1033603,5480,5480,0, 1, 0,17,0,0,TestFilePanel, -, -,TestFilePanel, 4815, 13",
-//                                     "8,3604,TestTimePanel::OnInitializing,1003604,5481,5481,0, 1, 0,17,0,0,TestTimePanel, -, -,TestTimePanel, 4344, 13" };
-//
-//                     int size = testLogs.length;
-//                     for (int i = 0; i < size; i++) {
-//                             String[] input = testLogs[i].split(",");
-//                             List<String> dddd = new ArrayList<String>();
-//                             for (int j = 0; j < input.length; j++) {
-//                                     dddd.add(input[j]);
-//                             }
-//                             getSceneTransformDataChecker().parserLog(dddd);
-//                     }
-//             }
-//
-//             if (testcode == 1) {
-//                     testcode++;
-//                     String[] testLogs = {
-//                                     "2,344,DABadaAppFrame::OnInitializing,1066601,5278,5278,0, 1, 0,17,0,0,    Form, 789, , ,  , , ",
-//                                     "2,345,DABadaAppForm::OnInitializing,1076601,5278,5278,0, 1, 0,17,0,0, Panel,790, ,789, , , ",
-//                                     "2,346,TestDictoryForm::OnInitializing,1126601,5278,5278,0, 1, 0,17,0,0, Panel,791, ,789, , , ",
-//                                     "2,347,TestTimeForm::OnInitializing,3196601,5279,5279,0, 1, 0,17,0,0,Panel,792, ,791, , , ",
-//                                     "2,348,TestSocketForm::OnInitializing,3436601,5279,5279,0, 1, 0,17,0,0, Form, 793, ,792, , , ",
-//                                     "2,349,TestFileForm::OnInitializing,3436601,5279,5279,0, 1, 0,17,0,0, Form, 794, ,791, , , ",
-//                                     "2,350,TestMallocForm::OnInitializing,3436601,5279,5279,0, 1, 0,17,0,0, Form, 795, ,, , , ",
-//                                     "2,351,TestThreadForm::OnInitializing,3436601,5279,5279,0, 1, 0,17,0,0, Panel, 796, ,,795 , , " };
-//
-//                     int size = testLogs.length;
-//                     for (int i = 0; i < size; i++) {
-//                             String[] input = testLogs[i].split(",");
-//                             List<String> dddd = new ArrayList<String>();
-//                             for (int j = 0; j < input.length; j++) {
-//                                     dddd.add(input[j]);
-//                             }
-//                             getControlDataChecker().parserLog(dddd);
-//                     }
-//             }
-//             // TEST LOG
-//             // ////////////////////////////////////////////////
        }
 
        public void setControlDataTFromLogPackage(LogPackage logPack) {
@@ -220,7 +175,11 @@ public class UIDataManager implements Runnable {
                        return;
                }
                List<List<String>> inputs = logs.getLogs();
-               getSceneTransformLogListQueue().putLog(inputs);
+       //      getSceneTransformLogListQueue().putLog(inputs);
+               int size = inputs.size();
+               for (int i = 0; i < size; i++) {
+                       getSceneTransformDataChecker().parserLog(inputs.get(i));
+               }
        }
 
        public void clear() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java
index b1b992c..6241b37 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java
@@ -52,9 +52,11 @@ public class UIControlListDataChecker {
                        getRemoveCallControlList()
                                        .add(input
                                                        .get(LogCenterConstants.USER_INTERFACE_CONTROL_LIST_CHILD_CLASS_NAME_INDEX));
+                       
+//                     System.out.println("control"+input);
 
                } else { // AddControl
-                                       // System.out.println("control"+input);
+//                                      System.out.println("control"+input);
                        if (isExistData(
                                        input.get(LogCenterConstants.USER_INTERFACE_CONTROL_LIST_PARENT_CLASS_NAME_INDEX),
                                        input.get(LogCenterConstants.USER_INTERFACE_CONTROL_LIST_CHILD_CLASS_NAME_INDEX)) == true) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformData.java
index a95db82..aaa8eff 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformData.java
@@ -104,8 +104,8 @@ public class UISceneTransformData {
        }
 
        public String getSceneName() {
-               if (strSceneName == null) {
-                       strSceneName = "";//$NON-NLS-1$
+               if (strSceneName == null || strSceneName.trim().equals("")) {
+                       strSceneName = "-";//$NON-NLS-1$
                }
                return strSceneName;
        }
@@ -126,8 +126,8 @@ public class UISceneTransformData {
        }
 
        public String getFormName() {
-               if (strFormName == null) {
-                       strFormName = "";//$NON-NLS-1$
+               if (strFormName == null|| strFormName.trim().equals("")) {
+                       strFormName = "-";//$NON-NLS-1$
                }
                return strFormName;
        }
@@ -137,8 +137,8 @@ public class UISceneTransformData {
        }
 
        public String getPanelName() {
-               if (strPanelName == null) {
-                       strPanelName = "";//$NON-NLS-1$
+               if (strPanelName == null|| strPanelName.trim().equals("")) {
+                       strPanelName = "-";//$NON-NLS-1$
                }
                return strPanelName;
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformDataChecker.java
index e86d9c8..c39d4b4 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformDataChecker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneTransformDataChecker.java
@@ -37,6 +37,8 @@ public class UISceneTransformDataChecker {
 
        public void parserLog(List<String> input) {
 
+//             System.out.println("UISceneTransformDataChecker"+input);
+               
                UISceneTransformData sceneData = new UISceneTransformData(input);
                sceneData.setSequence(input
                                .get(LogCenterConstants.SEQUENCE_NUMBER_INDEX));
@@ -63,7 +65,7 @@ public class UISceneTransformDataChecker {
        }
 
        private String getTransformTime() {
-               return "00:00:456";
+               return "-";
        }
 
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListTable.java
index cbd909a..e8c2436 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListTable.java
@@ -55,9 +55,9 @@ public class UITransformListTable extends DATableComposite {
                                AnalyzerManager.getCurrentPage().controlSelection(
                                                UITransformListView.ID);
 
-                               String test = items[0]
-                                               .getText(UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_TIME);
-                               System.out.println(" test : " + test);
+//                             String test = items[0]
+//                                             .getText(UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_TIME);
+               //              System.out.println(" test : " + test);
                        }
 
                        @Override
@@ -87,12 +87,11 @@ public class UITransformListTable extends DATableComposite {
                                inputData.add(sceneTransformsData.getData().get(j));
                        }
 
-                       DATableDataFormat tableData = new DATableDataFormat(
-                                       sceneTransformsData.getSequence());
+                       DATableDataFormat tableData = new DATableDataFormat(sceneTransformsData.getTime());
                        tableData.getData().addAll(inputData);
 
-                       text.add(sceneTransformsData.getSceneName()); // Scene Name
                        text.add(sceneTransformsData.getTime()); // Time
+                       text.add(sceneTransformsData.getSceneName()); // Scene Name
                        text.add(sceneTransformsData.getFormName()); // Form Name
                        text.add(sceneTransformsData.getPanelName()); // Panel Name
                        text.add(sceneTransformsData.getTransformTime()); // Panel Name

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListView.java
index 8d65e01..d7754f2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListView.java
@@ -52,18 +52,18 @@ public class UITransformListView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_2,
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_3,
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_4 };
-       private int[] columnSizes = { 90, 80, 90, 90, 90 };
+       private int[] columnSizes = { 75, 90, 90, 90, 90 };
        private boolean[] columnVisibility = { true, true, true, true, true };
 
-       int[] sortTypes = { AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_NUM,
+       int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING };
-
+       
        int[] sourceColumns = {
-                       UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LISTL_SCENE_NAME,
                        UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_TIME,
+                       UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LISTL_SCENE_NAME,
                        UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_FORM_NAME,
                        UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_PANEL_NAME,
                        UISceneTransformData.USER_INTERFACE_SCENE_TRANSFORMS_LIST_TRANSFORM_TIME };