[Title] refactoring UserInterface Page

[Desc.] meeting with leader
[Issue] redmine #7377

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
index 64ab1c3..3e41bfb 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java
@@ -94,6 +94,7 @@ public class FileDataMaker {
                int size = inputs.size();
                for (int i = 0; i < size; i++) {
                        List<String> input = inputs.get(i);
+       //              System.out.println("file b : "+input);
                        if (AnalyzerUtil.isInternal(input, false)) {
                                continue;
                        }

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 f7fec08..0f16e18 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
@@ -26,19 +26,20 @@
 
 package org.tizen.dynamicanalyzer.ui.userinterface;
 
+
 import java.util.List;
 
+
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
+import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.logparser.LogListQueue;
 import org.tizen.dynamicanalyzer.logparser.LogPackage;
-import org.tizen.dynamicanalyzer.logparser.LogParser;
 import org.tizen.dynamicanalyzer.logparser.Logs;
-import org.tizen.dynamicanalyzer.services.RecordStateSourceProvider;
 import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListDataChecker;
 import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingDataChecker;
 import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneTransformDataChecker;
-import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
+
 
 public class UIDataManager implements Runnable {
 
@@ -96,16 +97,14 @@ public class UIDataManager implements Runnable {
                        try {
                                boolean isSleep = true;
                                if (!controllogListQueue.isEmpty()) {
-                                       List<List<String>> inputs = controllogListQueue.getFirst();
-                                       int size = inputs.size();
-                                       for (int i = 0; i < size; i++) {
-                                               getControlDataChecker().parserLog(inputs.get(i));
+                                       List<List<String>> logs = controllogListQueue.getFirst();
+                                       for (int i = 0; i < logs.size(); i++) {
+                                               getControlDataChecker().parserLog(logs.get(i));
                                        }
                                        isSleep = false;
                                }
                                if (!sceneTransformlogListQueue.isEmpty()) {
-                                       List<List<String>> inputs = sceneTransformlogListQueue
-                                                       .getFirst();
+                                       List<List<String>> inputs = sceneTransformlogListQueue.getFirst();
                                        int size = inputs.size();
                                        for (int i = 0; i < size; i++) {
                                                getSceneTransformDataChecker().parserLog(inputs.get(i));
@@ -117,9 +116,7 @@ public class UIDataManager implements Runnable {
                                        Thread.sleep(AnalyzerConstants.LOG_CHECK_INTERVAL);
                                }
 
-                               if (((LogParser.isLogParsingEnd()) || (AnalyzerUtil
-                                               .getRecordState()
-                                               .equals(RecordStateSourceProvider.RECORD_READY)))) {
+                               if (AnalyzerManager.isLogParsingComplete()) {
                                        break;
                                }
 
@@ -160,13 +157,7 @@ public class UIDataManager implements Runnable {
                        return;
                }
                List<List<String>> inputs = logs.getLogs();
-//             getControlLogListQueue().putLog(inputs);
-               
-               int size = inputs.size();
-               for (int i = 0; i < size; i++) {
-                       getControlDataChecker().parserLog(inputs.get(i));
-               }
-               
+               getControlLogListQueue().putLog(inputs);                
        }
 
        public void setSceneTransformDataTFromLogPackage(LogPackage logPack) {
@@ -175,11 +166,7 @@ public class UIDataManager implements Runnable {
                        return;
                }
                List<List<String>> inputs = logs.getLogs();
-       //      getSceneTransformLogListQueue().putLog(inputs);
-               int size = inputs.size();
-               for (int i = 0; i < size; i++) {
-                       getSceneTransformDataChecker().parserLog(inputs.get(i));
-               }
+               getSceneTransformLogListQueue().putLog(inputs);
        }
 
        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 6241b37..69a01db 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
@@ -33,30 +33,14 @@ import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingD
 
 public class UIControlListDataChecker {
 
-       List<UIControlListData> formLeakList = null;
+       List<UIControlListData> controlList = null;
        List<String> removeCallControlList = null;
 
-       
        public void parserLog(List<String> input) {
-               
-       //      System.out.println("control"+input);
-               if (getClassName(input.get(LogCenterConstants.APINAME_INDEX)).trim()
-                               .equals("SetName")
-                               || getClassName(input.get(LogCenterConstants.APINAME_INDEX))
-                                               .trim().equals("RemoveFrame")
-                               || getClassName(input.get(LogCenterConstants.APINAME_INDEX))
-                                               .trim().equals("RemoveAllControl")) {
-                       return;
-               } else if (getClassName(input.get(LogCenterConstants.APINAME_INDEX))
-                               .trim().equals("RemoveControl")) {
-                       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);
+               String stClassName = getClassName(input.get(LogCenterConstants.APINAME_INDEX)).trim();
+               if (stClassName.equals("AddFrame") || stClassName.equals("AddControl") ) {
                        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) {
@@ -69,8 +53,7 @@ public class UIControlListDataChecker {
                                        .get(LogCenterConstants.SEQUENCE_NUMBER_INDEX));
                        controlData.setTime(input.get(LogCenterConstants.TIME_INDEX));
 
-                       controlData.setAPIName(getClassName(input
-                                       .get(LogCenterConstants.APINAME_INDEX)));
+                       controlData.setAPIName(stClassName);
 
                        controlData.setInitializeTime("-"); //$NON-NLS-1$
                        controlData.setTerminateTime("-"); //$NON-NLS-1$
@@ -101,6 +84,21 @@ public class UIControlListDataChecker {
 
                        addSortData(controlData);
                        setUIControlListTimeData();
+               } else if (stClassName.trim().equals("RemoveControl")) {
+                       getRemoveCallControlList()
+                                       .add(input
+                                                       .get(LogCenterConstants.USER_INTERFACE_CONTROL_LIST_CHILD_CLASS_NAME_INDEX));
+
+                       // System.out.println("control"+input);
+
+               }
+               
+               else if (stClassName.trim().equals("SetName")
+                               || stClassName.equals("RemoveFrame")
+                               || stClassName.equals("RemoveAllControl")) {
+                       return;
+               } else { // AddControl
+
                }
        }
 
@@ -143,7 +141,7 @@ public class UIControlListDataChecker {
 
        public void notificationFromUserInterfaceFunctionProfilingDataChecker(
                        int nChangedIndex) {
-               if (formLeakList != null) {
+               if (controlList != null) {
                        setUIControlListTimeData();
                }
        }
@@ -159,15 +157,15 @@ public class UIControlListDataChecker {
                                        splitProfilingList[0].trim());
                        String strProfilingAPIName = new String(
                                        splitProfilingList[splitProfilingList.length - 1].trim());
-                       for (int j = 0; j < formLeakList.size(); j++) {
-                               if (formLeakList.get(j).getChildClassName().trim()
+                       for (int j = 0; j < getDataList().size(); j++) {
+                               if (getDataList().get(j).getChildClassName().trim()
                                                .contains(strProfilingClassName)) {
                                        if (strProfilingAPIName.trim().contains("OnInitializing")) { //$NON-NLS-1$
-                                               formLeakList.get(j).setInitializeTime(
+                                               getDataList().get(j).setInitializeTime(
                                                                controlList.get(i).getExclEsapsedTime());
                                        } else if (strProfilingAPIName.trim().contains(
                                                        "OnTerminating")) { //$NON-NLS-1${
-                                               formLeakList.get(j).setTerminateTime(
+                                               getDataList().get(j).setTerminateTime(
                                                                controlList.get(i).getExclEsapsedTime());
                                        }
                                }
@@ -176,10 +174,10 @@ public class UIControlListDataChecker {
        }
 
        public List<UIControlListData> getDataList() {
-               if (null == formLeakList) {
-                       formLeakList = new ArrayList<UIControlListData>();
+               if (null == controlList) {
+                       controlList = new ArrayList<UIControlListData>();
                }
-               return formLeakList;
+               return controlList;
        }
 
        public List<String> getRemoveCallControlList() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
index 90b1a74..b5f3100 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
@@ -63,6 +63,7 @@ public class UIFunctionProfilingDataChecker {
 
                        int nListSize = getDataList().size();
                        for (int i = 0; i < nListSize; i++) {
+                               
                                if (getDataList().get(i).getSequence()
                                                .equals(input.getSequence())) {
                                        getDataList().remove(i);
@@ -70,14 +71,7 @@ public class UIFunctionProfilingDataChecker {
                                        bUpdateData = true;
                                        break;
                                }
-                       }
-
-                       nListSize = getDataList().size();
-                       for (int i = 0; i < nListSize; i++) {
-                               if (getDataList().get(i).getAPIName().equals(input.getParent())) { // Check,
-                                                                                                                                                                       // Exist
-                                                                                                                                                                       // Parent
-                                                                                                                                                                       // Node
+                               if (getDataList().get(i).getAPIName().equals(input.getParent())) {                                                                                                                      
                                        bExistParentData = true;
                                        break;
                                }