[Title] progress popup bug fix

[Desc.] bug fix
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/.classpath b/org.tizen.dynamicanalyzer/.classpath
index 2cdbc67..be21a73 100644 (file)
--- a/org.tizen.dynamicanalyzer/.classpath
+++ b/org.tizen.dynamicanalyzer/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="lib/sdblib.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
@@ -11,5 +10,6 @@
        <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.widgets.grid_1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.effects.stw.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.17.jar"/>
+       <classpathentry kind="lib" path="lib/sdblib.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

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 91bf184..6862e85 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
@@ -33,7 +33,7 @@ public class AnalyzerConstants {
        public static final String SAVE_DATA_VERSION = "0.6"; //$NON-NLS-1$\r
        public static final boolean CHECK_INTERNAL = true;\r
 \r
-       // /* special character */\r
+       /* special character */\r
        public static final String EMPTY = ""; //$NON-NLS-1$\r
        public static final String COLON = ":"; //$NON-NLS-1$\r
 \r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
index 6eb4508..7097947 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
@@ -75,7 +75,7 @@ public class AnalyzerManager {
        private static WarningChecker warningChecker = null;
 
        private static boolean appInfoArrived = false;
-       private static boolean sampleThread = false;
+       private static boolean isHaveSampleThread = false;
        private static boolean exit = false;
 
        private static String startBinaryAddr = null;
@@ -132,11 +132,11 @@ public class AnalyzerManager {
        }
 
        public static boolean hasSampleThread() {
-               return sampleThread;
+               return isHaveSampleThread;
        }
 
        public static void setSampleThread(boolean b) {
-               sampleThread = b;
+               isHaveSampleThread = b;
        }
 
        public static boolean isBinStartEndSet() {
@@ -203,7 +203,7 @@ public class AnalyzerManager {
                failedChecker = null;
                warningChecker = null;
                calledChecker = null;
-               sampleThread = false;
+               isHaveSampleThread = false;
                UserFunctionManager.getInstance().clear();
                FunctionUsageProfiler.clear();
                FunctionUsageProfiler.stopProfiler();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
index d93f930..e038d96 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
@@ -42,7 +42,6 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;\r
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;\r
 import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;\r
-import org.tizen.dynamicanalyzer.logparser.OpenTraceProgressManager;\r
 import org.tizen.dynamicanalyzer.model.ImageInfo;\r
 import org.tizen.dynamicanalyzer.model.LogCenter;\r
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;\r
@@ -63,6 +62,7 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingChildData;\r
 import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData;\r
 import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea;\r
+import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager;\r
 import org.tizen.dynamicanalyzer.ui.widgets.DADialog;\r
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;\r
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java
index 4eeae7c..7380f12 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java
@@ -125,6 +125,9 @@ public class MessageProcess {
                                if (!AnalyzerManager.hasSampleThread()) {
                                        AnalyzerManager.setSampleThread(true);
                                }
+                               System.out.println("sample get!");
+                               System.out.println(ToolbarArea.getInstance().getTime());
+                               System.out.println("sample time get!");
                                processUserProfiling(messages[1]);
                                break;
                        case AnalyzerConstants.MSG_DEVICE_LOG: /* device info : 4 */

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
index 51ec7f1..3236edb 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
@@ -78,7 +78,8 @@ public class StopLogProcessor implements Runnable {
                                        Display.getDefault().syncExec(new Runnable() {
                                                @Override
                                                public void run() {
-                                                       StopProcessManager.getInstance().saveProjectAndOthers();
+                                                       StopProcessManager.getInstance()
+                                                                       .saveProjectAndOthers();
                                                }
                                        });
 
@@ -88,12 +89,14 @@ public class StopLogProcessor implements Runnable {
                                                @Override
                                                public void run() {
                                                        UpdateViewTimer.stop();
+                                                       StopProcessManager.getInstance().updateTimerStop();
                                                }
                                        });
                                        Display.getDefault().syncExec(new Runnable() {
                                                @Override
                                                public void run() {
-                                                       StopProcessManager.getInstance().insertToDBComplete();
+                                                       StopProcessManager.getInstance()
+                                                                       .insertToDBComplete();
                                                }
                                        });
 
@@ -132,8 +135,8 @@ public class StopLogProcessor implements Runnable {
                                                Display.getDefault().syncExec(new Runnable() {
                                                        @Override
                                                        public void run() {
-                                                               StopProcessManager.getInstance().waitForLogParsing(
-                                                                               nSeclect);
+                                                               StopProcessManager.getInstance()
+                                                                               .waitForLogParsing(nSeclect);
                                                        }
                                                });
                                        }
@@ -141,7 +144,8 @@ public class StopLogProcessor implements Runnable {
                                        Display.getDefault().syncExec(new Runnable() {
                                                @Override
                                                public void run() {
-                                                       StopProcessManager.getInstance().waitForLogParsing(50);
+                                                       StopProcessManager.getInstance().waitForLogParsing(
+                                                                       50);
                                                }
                                        });
                                        System.out.println("wait for log parsing..."); //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java
index 3be8fec..908bf1b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java
@@ -59,7 +59,6 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerPaths;
 import org.tizen.dynamicanalyzer.common.CommonConstants;
 import org.tizen.dynamicanalyzer.common.DesignConstants;
-import org.tizen.dynamicanalyzer.logparser.OpenTraceProgressManager;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/OpenTraceProgressManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java
similarity index 98%
rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/OpenTraceProgressManager.java
rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java
index 35e45a9..ed35911 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/OpenTraceProgressManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java
@@ -23,7 +23,7 @@
  * - S-Core Co., Ltd
  * 
  */
-package org.tizen.dynamicanalyzer.logparser;
+package org.tizen.dynamicanalyzer.ui.toolbar.opentrace;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/UpdateViewTimer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/UpdateViewTimer.java
index 272b3f9..56f58a8 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/UpdateViewTimer.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/UpdateViewTimer.java
@@ -28,9 +28,7 @@ package org.tizen.dynamicanalyzer.utils;
 
 import java.util.Timer;
 
-import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
-import org.tizen.dynamicanalyzer.ui.info.range.StopProcessManager;
 import org.tizen.dynamicanalyzer.ui.toolbar.UpdateTimerTask;
 
 public class UpdateViewTimer {
@@ -71,12 +69,6 @@ public class UpdateViewTimer {
                        timer.cancel();
                        timer = null;
                        System.out.println("update timer stop"); //$NON-NLS-1$
-                       Display.getDefault().syncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       StopProcessManager.getInstance().updateTimerStop();
-                               }
-                       });
                }
        }
 }
\ No newline at end of file