From: greatim Date: Thu, 18 Sep 2014 06:38:49 +0000 (+0900) Subject: INTERNAL: move project maintainer to Global from AnalyzerManager X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72d8568e90576d461d06b55e1daad666f85dae32;p=sdk%2Ftools%2Fdynamic-analyzer.git INTERNAL: move project maintainer to Global from AnalyzerManager move project maintainer to Global from AnalyzerManager remove unnecessary import Change-Id: Icd7cb6dc3edf423a7a9ceb4719c6740275e56b8c Signed-off-by: greatim --- diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java index cc8bf6a..9b5cda9 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java @@ -31,7 +31,6 @@ import java.util.List; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java index 64272a4..b34ba64 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.widgets.da.view; -import java.awt.Button; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java index 5e37570..de1cf9d 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java @@ -1,9 +1,9 @@ package org.tizen.dynamicanalyzer.callback; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; public class ExecutionCallbackManager { private static Map> callbackMap = new HashMap>(); diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java index 4903698..7b9a703 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java @@ -38,7 +38,6 @@ import java.util.HashMap; import java.util.List; import org.tizen.common.core.application.InstallPathConfig; -import org.tizen.dynamicanalyzer.util.CommonUtil; public class InternalLogger { public enum testState { diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java index 52f7ba1..c92f6c9 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java @@ -34,8 +34,8 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; -import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; +import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; public class DACustomToggleButtonRenderer extends DACustomButtonRenderer { @Override diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java index 426947b..0e696db 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardItemList.java @@ -28,9 +28,9 @@ package org.tizen.dynamicanalyzer.widgets.chartBoard; import java.util.ArrayList; -import java.util.List; -import java.util.Comparator; import java.util.Collections; +import java.util.Comparator; +import java.util.List; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FormAttachment; diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardScaleRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardScaleRenderer.java index b695125..409a58c 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardScaleRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoardScaleRenderer.java @@ -29,7 +29,6 @@ package org.tizen.dynamicanalyzer.widgets.chartBoard; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; - import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; import org.tizen.dynamicanalyzer.widgets.scale.DAScaleAttribute; import org.tizen.dynamicanalyzer.widgets.scale.DAScaleDefaultRenderer; diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java index 8d20ba2..75b15b3 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java @@ -29,6 +29,7 @@ package org.tizen.dynamicanalyzer.common.path; import java.io.File; import java.io.FilenameFilter; + import org.tizen.common.core.application.InstallPathConfig; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.Logger; diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java index 3df0420..b4c828c 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java @@ -54,9 +54,9 @@ import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.WorkbenchLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.util.FileUtil; +import org.tizen.dynamicanalyzer.util.InternalLogger; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; -import org.tizen.dynamicanalyzer.util.InternalLogger; public class Application implements IApplication { private static final String LOG_PREFIX = "da_log_"; diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java index 8c59524..68cf1ce 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java @@ -38,7 +38,6 @@ import org.eclipse.ui.application.ActionBarAdvisor; import org.eclipse.ui.application.IActionBarConfigurer; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchWindowAdvisor; - import org.tizen.dynamicanalyzer.callback.ExecutionCallbackManager; public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java index d62873c..ee33ade 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java @@ -38,6 +38,7 @@ import java.io.PrintWriter; import java.io.RandomAccessFile; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; + import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.util.CommonUtil; 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 cfb0a3b..2764a98 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -66,7 +66,6 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class AnalyzerManager { - private static Project project = null; private static boolean isRunning = false; private static boolean isLogParsingComplete = false; @@ -136,6 +135,7 @@ public class AnalyzerManager { } public static void clear() { + Project project = Global.getProject(); if (null != project) { if (!project.isValid()) { String sourcePath = project.getSavePath(); @@ -150,7 +150,7 @@ public class AnalyzerManager { } } project.dispose(); - project = null; + Global.setProject(null); } imageSet = null; @@ -211,7 +211,7 @@ public class AnalyzerManager { long imgTime = Long.parseLong(imageList.get(i).getTime()); long time = Long.parseLong(timeStr); if (imgTime <= time) { - path = AnalyzerManager.getProject().getSavePath() + File.separator + path = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + imageList.get(i).getSeq() + CommonConstants.EXTENSION_PNG_IMAGE; } else { @@ -249,18 +249,6 @@ public class AnalyzerManager { return -1; } - public static void setProject(Project p) { - project = p; - } - - public static void setProjectNoRegist(Project p) { - project = p; - } - - public static Project getProject() { - return project; - } - public static NewLeakDetector getNewLeakDetector() { return newLeakDetector; } @@ -270,7 +258,7 @@ public class AnalyzerManager { } public static BaseCallstackManager getCallstackManager() { - Project curProject = getProject(); + Project curProject = Global.getProject(); if (curProject != null) { // TODO : protocol version definition String pver = curProject.getProtocolVersion(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java index 3e4e8fe..2f34941 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -27,6 +27,7 @@ package org.tizen.dynamicanalyzer.common; import java.io.File; + import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchListener; import org.eclipse.ui.IWorkbenchWindow; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ElfSymbolExtractor.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ElfSymbolExtractor.java index f71873d..4081050 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ElfSymbolExtractor.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ElfSymbolExtractor.java @@ -32,9 +32,9 @@ import java.util.HashMap; import java.util.List; import org.eclipse.cdt.utils.elf.Elf; +import org.eclipse.cdt.utils.elf.Elf.ELFhdr; import org.eclipse.cdt.utils.elf.Elf.PHdr; import org.eclipse.cdt.utils.elf.Elf.Symbol; -import org.eclipse.cdt.utils.elf.Elf.ELFhdr; import org.tizen.dynamicanalyzer.model.AddrSymbolPair; public class ElfSymbolExtractor { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/Global.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/Global.java index 418ffa4..6a8dc95 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/Global.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/Global.java @@ -17,18 +17,10 @@ public class Global { return currentDevice; } - public static Project getCurrentProject() { - return currentProject; - } - public static void setCurrentDeviceInfo(DeviceInfo device) { currentDevice = device; } - public static void setCurrentProject(Project project) { - currentProject = project; - } - public static PackageInfo getCurrentApplication() { return currentApplication; } @@ -41,8 +33,15 @@ public class Global { return currentConfiguration; } - public static void setCurrentConfiguration( - RunTimeConfiguration currentConfig) { + public static void setCurrentConfiguration(RunTimeConfiguration currentConfig) { currentConfiguration = currentConfig; } + + public static void setProject(Project p) { + currentProject = p; + } + + public static Project getProject() { + return currentProject; + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java index 33e24c1..ae830a8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java @@ -348,7 +348,7 @@ public class SymbolManager { String functionName = null; functionId = -1; - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); ProcessInformation process = project.getProcessInformation(pid); ProcessMemoryMap pmap = process.getProcessMemoryMap(time); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java index 0034814..acebe18 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java @@ -43,6 +43,7 @@ import java.nio.channels.FileLock; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBTable.java index 7563a8c..0537520 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBTable.java @@ -30,6 +30,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; + import org.tizen.dynamicanalyzer.constant.CommonConstants; public abstract class DBTable implements IPreparedStatement { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CommandActionHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CommandActionHandler.java index 6857861..52e9866 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CommandActionHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/CommandActionHandler.java @@ -3,19 +3,17 @@ package org.tizen.dynamicanalyzer.handlers; import java.io.File; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.sql.SqlManager; -import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; -import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class CommandActionHandler { public static boolean save(String saveFileName) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); String sourcePath = project.getSavePath(); String targetPath = PathManager.DA_SAVE_PATH + File.separator + saveFileName; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java index c46fa16..09f2d5f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -31,6 +31,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.Logger; @@ -45,7 +46,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - if (AnalyzerManager.getProject().getSavePath() + if (Global.getProject().getSavePath() .contains(PathManager.DA_TEMP_FOLDER_PATH)) { ToolbarArea.getInstance().setMainControlEnablement(true); } else { 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 b2fe76f..a649d55 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -28,6 +28,7 @@ package org.tizen.dynamicanalyzer.handlers; import java.io.File; import java.util.List; + import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -36,6 +37,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; @@ -77,7 +79,7 @@ public class OpenTraceHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { - project = AnalyzerManager.getProject(); + project = Global.getProject(); // establish db connection with new path SqlConnectionManager.closeConnection(); @@ -103,8 +105,8 @@ public class OpenTraceHandler extends AbstractHandler { DACustomCombo deviceCombo = ToolbarArea.getInstance() .getDeviceCombo(); DACustomCombo appCombo = ToolbarArea.getInstance().getAppCombo(); - deviceCombo.setText(AnalyzerManager.getProject().getDevice()); - appCombo.setText(AnalyzerManager.getProject().getAppName()); + deviceCombo.setText(Global.getProject().getDevice()); + appCombo.setText(Global.getProject().getAppName()); deviceCombo.setEnabled(true); appCombo.setEnabled(true); } @@ -241,7 +243,7 @@ public class OpenTraceHandler extends AbstractHandler { case ProfilingData.TYPE_LIBRARY: binaryId = (Integer) profilingData .get(ProfilingDataDBTable.COLUMN.BINARYID.index); - bInfo = AnalyzerManager.getProject().getDeviceStatusInfo().getBinaryInfo(binaryId); + bInfo = Global.getProject().getDeviceStatusInfo().getBinaryInfo(binaryId); name = bInfo.getTargetBinaryPath(); fupData = new ProfilingData(seq, name, exCount, inCount, callCount, inElapsedTime, exElapsedTime, profiler); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java index ac3484b..50e9f6f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/ReplayTraceHandler.java @@ -30,7 +30,7 @@ package org.tizen.dynamicanalyzer.handlers; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.data.ReplayData; @@ -58,18 +58,18 @@ public class ReplayTraceHandler extends AbstractHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { if (!DACommunicator.isSWAPVersion()) { - String xmlFileName = AnalyzerManager.getProject().getSavePath() + RECORD_DATA_FILE_NAME; + String xmlFileName = Global.getProject().getSavePath() + RECORD_DATA_FILE_NAME; if (xmlFileName == null || xmlFileName.isEmpty()) { return FAILED; } else { isReplay = true; - stopTime = AnalyzerManager.getProject().getReplayStopTime(); + stopTime = Global.getProject().getReplayStopTime(); } } else { isReplay = true; - stopTime = AnalyzerManager.getProject().getReplayStopTime(); - startTime = AnalyzerManager.getProject().getProfilingStartTime(); + stopTime = Global.getProject().getReplayStopTime(); + startTime = Global.getProject().getProfilingStartTime(); // make replay event // on/off , replay start time, count, event objs diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java index 32a63e6..31edfc0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java @@ -33,18 +33,12 @@ import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.graphics.Point; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -import org.tizen.dynamicanalyzer.swap.model.data.FileData; -import org.tizen.dynamicanalyzer.swap.model.data.GLES20LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.swap.model.data.NetworkData; -import org.tizen.dynamicanalyzer.swap.model.data.ThreadData; -import org.tizen.dynamicanalyzer.swap.model.data.UIEventData; import org.tizen.dynamicanalyzer.ui.file.FilePage; import org.tizen.dynamicanalyzer.ui.network.NetworkPage; import org.tizen.dynamicanalyzer.ui.opengl.GLPage; import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index 10a02b7..ac70ee8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.SymbolManager; import org.tizen.dynamicanalyzer.common.SymbolManager.SourceLine; import org.tizen.dynamicanalyzer.communicator.IDECommunicator; @@ -461,8 +461,8 @@ public class TableTooltipListener implements Listener { filePath = binData.getRpmSourceDir() + sourceLine.getFilePath(); } } else { - AppInfo appInfo = AnalyzerManager.getProject().getApplicationInfo(); - BinaryInfo binfo = AnalyzerManager.getProject().getDeviceStatusInfo() + AppInfo appInfo = Global.getProject().getApplicationInfo(); + BinaryInfo binfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(appInfo.getExecBinaryPath()); if (binfo.getTargetBinaryPath().equals(libName) @@ -532,7 +532,7 @@ public class TableTooltipListener implements Listener { List calltraceData = tableData.getData(); int binaryId = (Integer) calltraceData .get(FunctionEntryDBTable.COLUMN.BINARYID.index); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(binaryId); libName = binInfo.getTargetBinaryPath(); break; @@ -544,7 +544,7 @@ public class TableTooltipListener implements Listener { } private SourceLine getSourceLine(long addr, int pid, long time) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); ProcessInformation process = project.getProcessInformation(pid); ProcessMemoryMap pmap = process.getProcessMemoryMap(time); @@ -573,8 +573,8 @@ public class TableTooltipListener implements Listener { path = binInfo.getTempBinaryPath(); } } else { - AppInfo appInfo = AnalyzerManager.getProject().getApplicationInfo(); - BinaryInfo binfo = AnalyzerManager.getProject().getDeviceStatusInfo() + AppInfo appInfo = Global.getProject().getApplicationInfo(); + BinaryInfo binfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(appInfo.getExecBinaryPath()); if (binInfo.getID() == binfo.getID() // address belongs to c application executable diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java index d56d3a8..4cb388c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java @@ -30,15 +30,16 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.project.FunctionNameManager; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.util.Logger; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class LogParser implements Runnable { private static Thread logParser = null; @@ -134,7 +135,7 @@ public class LogParser implements Runnable { private void logSlicing(List logLumb) { // String[] slicedLog2 = null; - // Project project = AnalyzerManager.getProject(); + // Project project = Global.getProject(); // // int size = logLumb.size(); // LogPackage logPack = new LogPackage(); @@ -256,7 +257,7 @@ public class LogParser implements Runnable { // } // // // set last log number - // AnalyzerManager.getProject().setLastLogNum(seqNum, id); + // Global.getProject().setLastLogNum(seqNum, id); // } // // updateLog(logPack); @@ -264,7 +265,7 @@ public class LogParser implements Runnable { // private void processImage(final String from, String rotate) { // final String fileName = getImageName(from); - // final String to = AnalyzerManager.getProject().getSavePath() + // final String to = Global.getProject().getSavePath() // + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME // + File.separator + fileName; // final int angle = Integer.parseInt(rotate); @@ -281,7 +282,7 @@ public class LogParser implements Runnable { // SyncResult res = CommunicatorUtils.pull(from, to); // if (null != res && res.isOk()) { // /* image resizing */ - // String smallImagePath = AnalyzerManager.getProject() + // String smallImagePath = Global.getProject() // .getSavePath() // + File.separator // + AnalyzerConstants.IMAGE_FOLDER_NAME @@ -323,9 +324,9 @@ public class LogParser implements Runnable { // private void setFuncName(UserFunctionData input) { // boolean isPieBuild = AnalyzerUtil.isPieBuild(input.getPid(), // input.getTime()); - // String baseAddr = Long.toString(AnalyzerManager.getProject() + // String baseAddr = Long.toString(Global.getProject() // .getBaseAddress(input.getPid(), input.getTime())); - // // String path = AnalyzerManager.getProject().getBinaryPath(); + // // String path = Global.getProject().getBinaryPath(); // String path = AnalyzerUtil.getBinarySourcePath(input.getPid(), // input.getTime()); // String pcAddr = Long.toString(input.getPcAddr()); @@ -372,7 +373,7 @@ public class LogParser implements Runnable { newLog = new String[2]; // pid // newLog[0] = - // Integer.toString(AnalyzerManager.getProject().getPID()); + // Integer.toString(Global.getProject().getPID()); newLog[0] = null; newLog[1] = input[LogCenterConstants.PROFILING_LOG_PCADDR_INDEX]; @@ -639,7 +640,7 @@ public class LogParser implements Runnable { coreCount = i + 1; } if (coreCount != 0) { - AnalyzerManager.getProject().getDeviceStatusInfo().setCpuCount(coreCount); + Global.getProject().getDeviceStatusInfo().setCpuCount(coreCount); } byte[] cpuFrequency = new byte[temp.length]; System.arraycopy(temp, 0, cpuFrequency, 0, temp.length); 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 a38e2cd..c1a346f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java @@ -164,7 +164,7 @@ public class MessageProcess { private void processAppInfo(String message) { // String[] data = message.split(AnalyzerConstants.DATA_PARSING_TOKEN); // - // Project project = AnalyzerManager.getProject(); + // Project project = Global.getProject(); // TargetInfo tInfo = project.getTargetInfo(); // ProcessInfo pInfo = project.getProcessInfo(); // @@ -221,7 +221,7 @@ public class MessageProcess { // private void processImage(final String from) { // final String fileName = getImageName(from); - // final String to = AnalyzerManager.getProject().getSavePath() + // final String to = Global.getProject().getSavePath() // + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME // + File.separator + fileName; // diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/DeviceStatusInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/DeviceStatusInfo.java index 6987c30..c8699f6 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/DeviceStatusInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/DeviceStatusInfo.java @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.database.DBTable; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java index 64da02d..94ee3d3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java @@ -30,7 +30,7 @@ package org.tizen.dynamicanalyzer.project; import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.util.Logger; public class FunctionNameManager { @@ -59,7 +59,7 @@ public class FunctionNameManager { } public static List getFunctionList() { - DeviceStatusInfo deviceStatusInfo = AnalyzerManager.getProject().getDeviceStatusInfo(); + DeviceStatusInfo deviceStatusInfo = Global.getProject().getDeviceStatusInfo(); if (null != deviceStatusInfo) { return deviceStatusInfo.getFunctionList(); } else { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java index 4a1c640..37c6b3e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java @@ -25,14 +25,12 @@ */ package org.tizen.dynamicanalyzer.project; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicInteger; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java index 7637647..e46431d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java @@ -26,9 +26,9 @@ package org.tizen.dynamicanalyzer.project; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.NavigableMap; import java.util.TreeMap; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 3eb91b2..88a0548 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -41,7 +41,6 @@ import java.util.List; import java.util.Map; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; @@ -50,8 +49,8 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.database.DBTableRegistry; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; import org.tizen.dynamicanalyzer.model.DeviceInfo; -import org.tizen.dynamicanalyzer.project.data.FunctionNameDBTable; import org.tizen.dynamicanalyzer.project.data.BinaryInfoDBTable; +import org.tizen.dynamicanalyzer.project.data.FunctionNameDBTable; import org.tizen.dynamicanalyzer.project.data.MemoryMapDBTable; import org.tizen.dynamicanalyzer.project.data.ProcessInfoDBTable; import org.tizen.dynamicanalyzer.sql.SqlManager; @@ -341,7 +340,7 @@ public class Project { } } - AnalyzerManager.setProject(this); + Global.setProject(this); // close previous database connection SqlConnectionManager.closeConnection(); 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 795480b..460d2b4 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -40,6 +40,7 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.project.Project; @@ -59,7 +60,7 @@ public class SqlManager { private boolean isQueryPrint = false; private Connection getConnection() { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (null != project && !AnalyzerManager.isExit()) { return getConnection(project.getSavePath()); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java index 64236c1..b41c1a2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java @@ -51,8 +51,8 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackInserter; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackItem; +import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -175,7 +175,7 @@ public abstract class BaseCallstackManager { } public String getUserFunctionPosition(int pid, long time) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); ProcessInformation process = project.getProcessInformation(pid); ProcessMemoryMap pmap = process.getProcessMemoryMap(time); @@ -200,8 +200,8 @@ public abstract class BaseCallstackManager { } public boolean checkUserCall(String input) { - AppInfo appInfo = AnalyzerManager.getProject().getApplicationInfo(); - BinaryInfo binfo = AnalyzerManager.getProject().getDeviceStatusInfo() + AppInfo appInfo = Global.getProject().getApplicationInfo(); + BinaryInfo binfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(appInfo.getExecBinaryPath()); if (binfo.getTargetBinaryPath().equals(input)) { return true; @@ -215,7 +215,7 @@ public abstract class BaseCallstackManager { String functionName = null; String symbol = null; - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); ProcessInformation process = project.getProcessInformation(pid); ProcessMemoryMap pmap = process.getProcessMemoryMap(time); @@ -255,7 +255,7 @@ public abstract class BaseCallstackManager { LibraryObject libraryObject = pmap.getLibraryByAddress(addr); if (null != libraryObject) { int binaryID = libraryObject.getBinaryID(); - BinaryInfo binfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(binaryID); String path = binfo.getTargetBinaryPath(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java index 28f423e..821e49c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.NavigableMap; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.FunctionNameManager; @@ -84,7 +84,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { if (null == selfCallstackUnit) { String strSelfFuncName = FunctionNameManager.getFunctionName(log.getApiId()); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(log.getBinaryId()); String strSelfSymbol = binInfo.getTargetBinaryPath() + AnalyzerConstants.CALLSTACK_API_TOKEN_STRING + strSelfFuncName; @@ -189,7 +189,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { String apiName = FunctionNameManager.getFunctionName(log.getApiId()); if (apiName.equals("main")) { //$NON-NLS-1$ - ProcessInformation process = AnalyzerManager.getProject().getProcessInformation( + ProcessInformation process = Global.getProject().getProcessInformation( log.getPid()); process.setDropLog(true); } @@ -211,7 +211,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { // TODO: use callstackunit made during trace time if (null == selfCallstackUnit) { String strSelfFuncName = FunctionNameManager.getFunctionName(pData.getApiId()); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(pData.getBinaryId()); String strSelfSymbol = binInfo.getTargetBinaryPath() + AnalyzerConstants.CALLSTACK_API_TOKEN_STRING + strSelfFuncName; @@ -354,7 +354,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { } public boolean isAddrInBinaryRange(int pid, long time, long addr) { - ProcessMemoryMap pmap = AnalyzerManager.getProject().getProcessInformation(pid) + ProcessMemoryMap pmap = Global.getProject().getProcessInformation(pid) .getProcessMemoryMap(time); if (null == pmap) { return false; @@ -376,7 +376,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { int size = binPaths.size(); for (int i = 0; i < size; i++) { String binPath = binPaths.get(i); - BinaryInfo bininfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo bininfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(binPath); LibraryObject libObj = pmap.getLibraryByBinaryID(bininfo.getID()); if (null == libObj) { @@ -390,14 +390,14 @@ public class SWAPCallStackManager extends BaseCallstackManager { } public boolean isPieBuild(int pid, long time) { - ProcessMemoryMap pmap = AnalyzerManager.getProject().getProcessInformation(pid) + ProcessMemoryMap pmap = Global.getProject().getProcessInformation(pid) .getProcessMemoryMap(time); if (null == pmap) { return false; } LibraryObject obj = pmap.getMainbinary(); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(obj.getBinaryID()); if (null == binInfo || binInfo.getType() != 1) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java index 85c0b7a..81c64ba 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java @@ -26,7 +26,7 @@ */ package org.tizen.dynamicanalyzer.swap.channel.data; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.swap.model.DATime; @@ -108,7 +108,7 @@ public class BasicDataMessage { int nano = (int) (time % 10000); nano *= 100000; - DATime startTime = AnalyzerManager.getProject().getProfilingStartTime(); + DATime startTime = Global.getProject().getProfilingStartTime(); int startSec = startTime.getSec(); int startNano = startTime.getNano(); @@ -116,7 +116,7 @@ public class BasicDataMessage { Logger.debug("if show this log then process info is not comming or late!!"); startTime.setSec(sec); startTime.setNano(nano); - AnalyzerManager.getProject().setProfilingStartTime(startTime); + Global.getProject().setProfilingStartTime(startTime); startSec = sec; startNano = nano; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index fa6c47f..7c0b52c 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -243,7 +243,7 @@ public class Communicator30 extends BaseCommunicator { index += INT_SIZE; int nano = ByteUtil.toInt(data, index); - AnalyzerManager.getProject().setProfilingStartTime(new DATime(sec, nano)); + Global.getProject().setProfilingStartTime(new DATime(sec, nano)); } } else { DACommunicator.setRunning(false); @@ -291,7 +291,7 @@ public class Communicator30 extends BaseCommunicator { Map selectedProcess = apps.get(0).getRunningProcesses(); if (selectedProcess != null && selectedProcess.size() > 0) { for (Map.Entry entry : selectedProcess.entrySet()) { - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(entry.getValue()); String temppath = binInfo.getTempBinaryPath(); if (temppath == null) { @@ -328,7 +328,7 @@ public class Communicator30 extends BaseCommunicator { continue; } - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(app.getExecBinaryPath()); String temppath = binInfo.getTempBinaryPath(); if (temppath == null) { @@ -495,7 +495,7 @@ public class Communicator30 extends BaseCommunicator { if (isCorrectAck(MSG_CONFIG_ACK, result)) { if (AnalyzerManager.isRunning()) { rt.setApplyTime(ToolbarArea.getInstance().getTime()); - AnalyzerManager.getProject().addConfigHistory(rt); + Global.getProject().addConfigHistory(rt); } else { rt.setApplyTime(0); // set time of configuration to zero } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java index adf00a8..fa224cd 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java @@ -47,6 +47,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.handlers.ReplayTraceHandler; @@ -157,7 +158,7 @@ public class MessageParser { } private void processProcessInfo(byte[] data) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); int pid = 0; int ppid = 0; @@ -233,7 +234,7 @@ public class MessageParser { } private void memoryMapChanged(byte[] data) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); /** parsing */ int index = 0; @@ -515,7 +516,7 @@ public class MessageParser { String name = ByteUtil.getString(data, index); index += ByteUtil.getStringLength(data, index); - ProcessInformation process = AnalyzerManager.getProject().getProcessInformation(pid); + ProcessInformation process = Global.getProject().getProcessInformation(pid); if (null != process) { process.setProcessName(name); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index 1f01d2e..f268ee1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -42,7 +42,6 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.project.FunctionNameManager; -import org.tizen.dynamicanalyzer.project.ProcessInformation; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.model.data.ContextSwitchData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; @@ -183,7 +182,7 @@ public class SWAPLogParser implements Runnable { // if (pData.getProbeType() // == AnalyzerConstants.FUNCTION_TYPE_APPINST) { -// ProcessInformation process = AnalyzerManager.getProject() +// ProcessInformation process = Global.getProject() // .getProcessInformation(pData.getPid()); if(pData.getProbeType() != AnalyzerConstants.FUNCTION_TYPE_FILE) { int apiId = SymbolManager.getFuncId(pData, pData.getPcAddr(), @@ -277,7 +276,7 @@ public class SWAPLogParser implements Runnable { private void processImage(final String from, final int angle) { final String fileName = getImageName(from); - final String to = AnalyzerManager.getProject().getSavePath() + File.separator + final String to = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + fileName; if (angle != 0) { Logger.debug("[ image rotate : " + angle + " ]"); @@ -293,7 +292,7 @@ public class SWAPLogParser implements Runnable { if (null != res && res.isOk()) { DACommunicator.removeCommand(from); /* image resizing */ - String smallImagePath = AnalyzerManager.getProject() + String smallImagePath = Global.getProject() .getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME @@ -342,7 +341,7 @@ public class SWAPLogParser implements Runnable { File file = new File(path); if (file.exists()) { /* image resizing */ - String smallImagePath = AnalyzerManager.getProject() + String smallImagePath = Global.getProject() .getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java index fa4efde..6bcde80 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java @@ -32,12 +32,12 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.DATime; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.util.Logger; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public abstract class LogData implements Cloneable { public static boolean isSWAP = false; @@ -79,7 +79,7 @@ public abstract class LogData implements Cloneable { long nano = ByteUtil.toInt(data, index); index += INT_SIZE; - DATime startTime = AnalyzerManager.getProject().getProfilingStartTime(); + DATime startTime = Global.getProject().getProfilingStartTime(); long startSec = startTime.getSec(); long startNano = startTime.getNano(); long resultSec = sec - startSec; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java index e574dad..73d62af 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java @@ -34,7 +34,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.FunctionNameManager; import org.tizen.dynamicanalyzer.project.LibraryObject; @@ -118,7 +118,7 @@ public class ProbeCommonData extends LogData { reserved2 = ByteUtil.toInt(data, index); index += INT_SIZE; - ProcessInformation process = AnalyzerManager.getProject().getProcessInformation( + ProcessInformation process = Global.getProject().getProcessInformation( pid); if (time > 0) { LibraryObject obj = null; @@ -126,7 +126,7 @@ public class ProbeCommonData extends LogData { if (pmap == null || (obj = pmap.getLibraryByAddress(callerAddress)) == null) { libName = "unknown"; } else { - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(obj.getBinaryID()); libName = binInfo.getTargetBinaryPath(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java index e664f04..1a49374 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java @@ -35,7 +35,7 @@ import static org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants.M import static org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants.MSG_FUNCTION_EXIT; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.project.LibraryObject; import org.tizen.dynamicanalyzer.project.ProcessInformation; import org.tizen.dynamicanalyzer.project.ProcessMemoryMap; @@ -188,7 +188,7 @@ public class ProfileData extends LogData { } if (probeType != AnalyzerConstants.FUNCTION_TYPE_FILE) { - ProcessInformation process = AnalyzerManager.getProject().getProcessInformation( + ProcessInformation process = Global.getProject().getProcessInformation( pid); if (null == process) { Logger.error("ProfileData of type: " + id + " is from wrong process: " + pid diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java index 1b8d98a..c52158b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java @@ -31,7 +31,7 @@ import static org.tizen.dynamicanalyzer.constant.CommonConstants.INT_SIZE; import java.util.ArrayList; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.RecordEventObject; @@ -64,7 +64,7 @@ public class ReplayData extends LogData { eventTime.setSec(sec); eventTime.setNano(nano); - DATime startTime = AnalyzerManager.getProject().getProfilingStartTime(); + DATime startTime = Global.getProject().getProfilingStartTime(); long startSec = startTime.getSec(); long startNano = startTime.getNano(); long resultSec = sec - startSec; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java index d41502b..116ac00 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java @@ -34,7 +34,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.util.Logger; @@ -97,9 +97,9 @@ public class SystemData extends LogData { public boolean makeData(byte[] data) { super.makeData(data); // index = MessageParser.MSG_HEADER_SIZE; - int coreCount = AnalyzerManager.getProject().getDeviceStatusInfo() + int coreCount = Global.getProject().getDeviceStatusInfo() .getCpuCount(); - int deviceCount = AnalyzerManager.getProject().getDeviceStatusInfo() + int deviceCount = Global.getProject().getDeviceStatusInfo() .getDeviceCount(); cpuFrequency = parseCpu(index, data); @@ -223,7 +223,7 @@ public class SystemData extends LogData { } private static String parseCpu(int start, byte[] payload) { - int coreCount = AnalyzerManager.getProject().getDeviceStatusInfo() + int coreCount = Global.getProject().getDeviceStatusInfo() .getCpuCount(); StringBuffer buffer = new StringBuffer(); for (int i = 0; i < coreCount; i++) { @@ -238,7 +238,7 @@ public class SystemData extends LogData { } private static String parseUsage(int start, byte[] payload) { - int count = AnalyzerManager.getProject().getDeviceStatusInfo() + int count = Global.getProject().getDeviceStatusInfo() .getDeviceCount(); StringBuffer buffer = new StringBuffer(); for (int i = 0; i < count; i++) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java index afaea53..8380e7b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java @@ -34,6 +34,7 @@ import java.nio.file.FileAlreadyExistsException; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java index ea5aaad..5031526 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorerDilaog.java @@ -45,7 +45,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.common.Global; -import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.nl.WidgetLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.platform.ui.ExplorerUtil; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java index 9cd42ee..192e731 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java @@ -42,13 +42,12 @@ import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.project.FunctionNameManager; import org.tizen.dynamicanalyzer.swap.model.data.FileData; +import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; +import org.tizen.dynamicanalyzer.ui.file.model.FileEvent; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.utils.Formatter; -import org.tizen.dynamicanalyzer.ui.file.FilePage; -import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; -import org.tizen.dynamicanalyzer.ui.file.model.FileEvent; public class FileApiListTable extends DAApiListTableComposite { 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 ba568e0..3b53aab 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java @@ -36,6 +36,7 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; +import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; import org.tizen.dynamicanalyzer.ui.file.model.FileEvent; import org.tizen.dynamicanalyzer.ui.file.model.FileSelectedData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; @@ -43,7 +44,6 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; public class FileApiListView extends DAViewComposite { private long analysisStartTime = 0; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java index 8cb6259..650d25f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java @@ -60,8 +60,8 @@ import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; -import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; +import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java index 331175a..ed8757f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java @@ -40,9 +40,8 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; -import org.tizen.dynamicanalyzer.ui.file.FilePage; -import org.tizen.dynamicanalyzer.ui.file.model.FileEvent; import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; +import org.tizen.dynamicanalyzer.ui.file.model.FileEvent; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java index cb7467a..b5526d3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java @@ -34,9 +34,9 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; +import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; public class FilePage extends DAPageComposite { // page and view IDs diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java index f04d503..7f1f314 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java @@ -28,7 +28,6 @@ package org.tizen.dynamicanalyzer.ui.file.manager; import java.util.ArrayList; - import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -41,6 +40,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DALimit; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; @@ -645,7 +645,7 @@ public class FileDataMaker { String[] splitApiFilePath = filePath.split(CommonConstants.SLASH); String strApiFilePath = new String( splitApiFilePath[splitApiFilePath.length - 1].trim()); - if (AnalyzerManager.getProject().getPackageID().equals(strApiFilePath)) { + if (Global.getProject().getPackageID().equals(strApiFilePath)) { return true; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java index c38b0d4..a7743b1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java @@ -29,10 +29,8 @@ package org.tizen.dynamicanalyzer.ui.file.model; import java.util.ArrayList; import java.util.List; -import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.swap.model.data.FileData; import org.tizen.dynamicanalyzer.ui.file.data.FileApiDB; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; public class FileEvent extends FileData{ // TODO considering apiId diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileStatus.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileStatus.java index b7de2c5..04af3c7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileStatus.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileStatus.java @@ -29,7 +29,6 @@ package org.tizen.dynamicanalyzer.ui.file.model; import java.util.ArrayList; import java.util.List; -import org.tizen.dynamicanalyzer.ui.file.data.FileAccessDB; import org.tizen.dynamicanalyzer.ui.file.data.FileStatusDB; public class FileStatus { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackInserter.java index e27117b..4db3cd8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackInserter.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.project.BinaryInfo; // inserter thread for callstackdata, callstackunit @@ -97,7 +97,7 @@ public class CallStackInserter implements Runnable { try { insertRowData.add(new Integer(csu.getPid())); insertRowData.add(new Integer(csu.getFunctionId())); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(csu.getPath()); insertRowData.add(new Integer(binInfo.getID())); insertRowData.add(new Long(csu.getAddr())); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java index a7c37d3..f95ea52 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java @@ -33,6 +33,7 @@ import java.util.Map; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.SymbolManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.logparser.LogParser; @@ -51,7 +52,7 @@ public class CallStackManager extends BaseCallstackManager { UserFunctionData log = (UserFunctionData) input; Map addrMap = getCallStackApiAddrByPidMap(log.getPid()); boolean isPieBuild = AnalyzerUtil.isPieBuild(log.getPid(), log.getTime()); - ProcessMemoryMap pmap = AnalyzerManager.getProject() + ProcessMemoryMap pmap = Global.getProject() .getProcessInformation(log.getPid()).getProcessMemoryMap(log.getTime()); if (pmap == null) { return; @@ -215,7 +216,7 @@ public class CallStackManager extends BaseCallstackManager { UserFunctionData log = (UserFunctionData) input; Map addrMap = getCallStackApiAddrByPidMap(log.getPid()); boolean isPieBuild = AnalyzerUtil.isPieBuild(log.getPid(), log.getTime()); - ProcessMemoryMap pmap = AnalyzerManager.getProject() + ProcessMemoryMap pmap = Global.getProject() .getProcessInformation(log.getPid()).getProcessMemoryMap(log.getTime()); if (pmap == null) { return; @@ -379,7 +380,7 @@ public class CallStackManager extends BaseCallstackManager { Map addrMap = getCallStackApiAddrByPidMap(inputData.getPid()); boolean isPieBuild = AnalyzerUtil.isPieBuild(inputData.getPid(), inputData.getTime()); - ProcessMemoryMap pmap = AnalyzerManager.getProject() + ProcessMemoryMap pmap = Global.getProject() .getProcessInformation(inputData.getPid()) .getProcessMemoryMap(inputData.getTime()); if (pmap == null) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java index 47b2f85..12cad73 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java @@ -27,7 +27,7 @@ package org.tizen.dynamicanalyzer.ui.info.callstack; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; import org.tizen.dynamicanalyzer.project.BinaryInfo; @@ -88,7 +88,7 @@ public class CallStackUnit { this.functionId = functionId; this.functionName = FunctionNameManager.getFunctionName(functionId); - BinaryInfo bInfo = AnalyzerManager.getProject().getDeviceStatusInfo().getBinaryInfo(binaryId); + BinaryInfo bInfo = Global.getProject().getDeviceStatusInfo().getBinaryInfo(binaryId); this.path = bInfo.getTargetBinaryPath(); offset = CommonConstants.EMPTY; etc = CommonConstants.EMPTY; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java index dde1d92..d63c188 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java @@ -34,7 +34,7 @@ import java.io.File; import org.json.simple.JSONObject; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.JsonUtil; @@ -61,7 +61,7 @@ public class EmulatorScreenshot implements ILsn { public String getFilePath() { String filepath, filename; filename = "snapshot" + filecount; - filepath = AnalyzerManager.getProject().getSavePath() + filepath = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + filename; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java index 38fc282..4117cb0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java @@ -51,6 +51,7 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.ScreenshotConstants; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -261,7 +262,7 @@ public class ImageViewer extends Composite { if (imageInfo.getSeq().equals("-1") || index < 0) { //$NON-NLS-1$ path = AnalyzerConstants.DEFAULT_IMAGE_NAME; } else { - path = AnalyzerManager.getProject().getSavePath() + path = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + imageInfo.getFileName(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java index 303cde6..623efd3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java @@ -30,8 +30,8 @@ package org.tizen.dynamicanalyzer.ui.info.screenshot; -import java.util.Map; import java.util.HashMap; +import java.util.Map; public class ListenMap { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java index 986c7ba..b1d24a9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java @@ -34,10 +34,10 @@ import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; -import org.tizen.dynamicanalyzer.util.Logger; -import org.tizen.dynamicanalyzer.utils.JsonUtil; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type; +import org.tizen.dynamicanalyzer.util.Logger; +import org.tizen.dynamicanalyzer.utils.JsonUtil; public class MsgMgr { private Map _msg_map = new HashMap(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java index a89a52e..95fb948 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java @@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -293,7 +294,7 @@ public class ScreenshotView extends DAViewComposite { cpuUsage.add(value); } - long totalMem = AnalyzerManager.getProject().getDeviceStatusInfo().getSystemMemorySize(); + long totalMem = Global.getProject().getDeviceStatusInfo().getSystemMemorySize(); maxMem = totalMem; /* @@ -423,7 +424,7 @@ public class ScreenshotView extends DAViewComposite { cpuUsage.add(cpuRates.get(i)); } - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (project != null) maxMem = project.getDeviceStatusInfo().getSystemMemorySize(); processMem = dataManager.getLastProcessMemory(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java index 86a1fba..cedae31 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java @@ -51,9 +51,9 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; +import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; -import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardHeightChangeableItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItemList; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java index 8741c91..ac9fbc6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java @@ -56,9 +56,9 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; +import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; -import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardHeightChangeableItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java index c097a73..8930a32 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java @@ -36,7 +36,6 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java index 0773192..db9f0bf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java @@ -41,8 +41,8 @@ import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.opengl.GLPage; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataManager; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLAPIData; -import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLES20ErrorDefine; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLConstantDefine; +import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLES20ErrorDefine; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java index 167f92a..ffb5ed0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java @@ -53,6 +53,7 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable; import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionExitDBTable; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -60,7 +61,6 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DATabButton; import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; -import org.tizen.dynamicanalyzer.util.Logger; public class RangeDataManager implements Runnable { private static RangeDataManager instance = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java index 4d07ac1..a260433 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java @@ -40,9 +40,9 @@ import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiDataMaker; import org.tizen.dynamicanalyzer.ui.summary.leaks.CurrentLeakData; import org.tizen.dynamicanalyzer.ui.summary.leaks.FreeDataDBTable; +import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDataMaker; import org.tizen.dynamicanalyzer.ui.summary.leaks.MemoryAllocationDataDBTable; -import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.leaks.NewLeakDetector; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataMaker; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java index 8861b5e..97efc10 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java @@ -37,7 +37,6 @@ import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiListView; -import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java index ae8762a..be13cdc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java @@ -29,15 +29,14 @@ package org.tizen.dynamicanalyzer.ui.summary.leaks; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DALimit; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; -import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; @@ -49,7 +48,6 @@ import org.tizen.dynamicanalyzer.swap.model.data.MemoryData; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; -import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; public class LeakDataMaker { @@ -308,7 +306,7 @@ public class LeakDataMaker { public void makeLeakDataForRange(Long startTime, Long endTime) { clearLeakDataForRange(); - int[] pids = AnalyzerManager.getProject().getProcessIDs(); + int[] pids = Global.getProject().getProcessIDs(); for (int i = 0; i < pids.length; i++) { List> allocDataList = getAllocationDataWithPidFromDBForRange(startTime, endTime, pids[i]); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java index a394106..0526d10 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java @@ -36,6 +36,7 @@ import java.util.NavigableMap; import java.util.SortedMap; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.SummaryLabels; @@ -164,7 +165,7 @@ public class FunctionUsageProfiler extends PageDataManager { insertRowData.add(new Byte(type)); if (pData.isParent()) { // library insertRowData.add(new Integer(pData.getFunctionId())); // -1 (default value) - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(pData.getName()); insertRowData.add(new Integer(binInfo.getID())); } else { // function diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java index 46b3a5a..2770426 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java @@ -33,8 +33,6 @@ import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; -import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBInserter; -import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBTable; public class WarningDataMaker { private static int warningSeq = 1; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDetailView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDetailView.java index f956e0e..7bb0837 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDetailView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDetailView.java @@ -36,13 +36,11 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.SummaryLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java index f53e045..0031b98 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java @@ -27,9 +27,9 @@ package org.tizen.dynamicanalyzer.ui.thread.sync; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.List; -import java.util.Comparator; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java index 9a8be3a..ad41a7b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java @@ -27,9 +27,9 @@ package org.tizen.dynamicanalyzer.ui.thread.thread; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.List; -import java.util.Comparator; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.SymbolManager; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java index 9bfef26..144ad79 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceDataManager.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.project.ProcessInformation; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; @@ -104,7 +104,7 @@ public class CallTraceDataManager extends PageDataManager { insertData.add(insertRowData); // for calltrace table windowing - ProcessInformation process = AnalyzerManager.getProject() + ProcessInformation process = Global.getProject() .getProcessInformation(pData.getPid()); process.addFunctionEntryLogCount(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java index 51e616d..88a4906 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java @@ -29,6 +29,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.calltrace; import java.util.ArrayList; import java.util.List; + import org.eclipse.nebula.widgets.grid.Grid; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.events.SelectionEvent; @@ -37,6 +38,7 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.FunctionNameManager; @@ -105,7 +107,7 @@ public class CallTraceTable extends DAWindowingTableComposite { // TODO: ret value text.add(""); int binaryId = (Integer) rowData.get(FunctionEntryDBTable.COLUMN.BINARYID.index); - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(binaryId); text.add(binInfo.getTargetBinaryPath()); @@ -145,18 +147,18 @@ public class CallTraceTable extends DAWindowingTableComposite { } public int getItemCountByPid() { - if (null == AnalyzerManager.getProject()) { + if (null == Global.getProject()) { return 0; } int itemCount = 0; int selectedPid = ToolbarArea.getInstance().getSelectedPid(); if (selectedPid != 0) { - ProcessInformation process = AnalyzerManager.getProject() + ProcessInformation process = Global.getProject() .getProcessInformation(selectedPid); itemCount = process.getFunctionEntryLogCount(); } else { - itemCount = AnalyzerManager.getProject().getTotalFunctionEntryCount(); + itemCount = Global.getProject().getTotalFunctionEntryCount(); } return itemCount; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java index 868e7a1..15edc76 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import org.eclipse.swt.widgets.Display; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -116,11 +116,11 @@ public class CPUChart extends TimelineChart { appLoadSeries.clear(); totalLoadSeries.clear(); - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } - int coreSize = AnalyzerManager.getProject().getDeviceStatusInfo().getCpuCount(); + int coreSize = Global.getProject().getDeviceStatusInfo().getCpuCount(); Collection processSeries = childSeriesMap.values(); if (processSeries != null) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java index c1c70ff..91eeb83 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.graphics.Color; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -87,10 +87,10 @@ public class CPUCoreChart extends TimelineChart { @Override public void inputChartSeries(List dataList) { if (coreSize == TimelineConstants.NOT_INITED) { - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } - coreSize = AnalyzerManager.getProject().getDeviceStatusInfo().getCpuCount(); + coreSize = Global.getProject().getDeviceStatusInfo().getCpuCount(); for (int i = 0; i < coreSize; i++) { DAChartSeries chartSeries = new DAChartSeries( TimelineChartLabels.CPU_CORE_CHART_SERIES_NAME_CORE + i, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java index bad7b18..8a0b0cf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.graphics.Color; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -84,10 +84,10 @@ public class CPUFrequencyChart extends TimelineChart { @Override public void inputChartSeries(List dataList) { if (coreSize == TimelineConstants.NOT_INITED) { - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } - coreSize = AnalyzerManager.getProject().getDeviceStatusInfo().getCpuCount(); + coreSize = Global.getProject().getDeviceStatusInfo().getCpuCount(); for (int i = 0; i < coreSize; i++) { DAChartSeries chartSeries = new DAChartSeries( TimelineChartLabels.CPU_CORE_CHART_SERIES_NAME_CORE + i, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java index 27f7145..6eafc16 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java @@ -30,7 +30,7 @@ package org.tizen.dynamicanalyzer.ui.timeline.chart; import java.util.ArrayList; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -133,12 +133,12 @@ public class EnergyChart extends TimelineChart { try { if (chart.getSeriesList().isEmpty()) { - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } chart.addSeries(energyUsageSeries); - String[] deviceList = AnalyzerManager.getProject().getDeviceStatusInfo() + String[] deviceList = Global.getProject().getDeviceStatusInfo() .getDevices().split(CommonConstants.COMMA); for (String device : deviceList) { deviceUsageSeriesList.add(new DAChartSeries(device, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java index 6d9f708..5830cd4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import org.eclipse.swt.widgets.Display; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.LibraryObject; @@ -89,7 +89,7 @@ public class HeapChart extends TimelineChart { /* * Add additional library allocation */ - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); List binDataList = BinarySettingManager.getInstance() .getBinarySettingList(); ProcessMemoryMap pmap = project.getProcessInformation(pid).getProcessMemoryMap( @@ -174,7 +174,7 @@ public class HeapChart extends TimelineChart { } } - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java index feb7e45..24d906a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import org.eclipse.swt.widgets.Display; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -151,7 +151,7 @@ public class ProcessMemoryChart extends TimelineChart { } } - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } @SuppressWarnings("unchecked") diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java index fdd4382..4f37dd9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java @@ -34,7 +34,7 @@ import org.eclipse.swt.SWTException; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; @@ -102,10 +102,10 @@ public class ScreenshotChart extends TimelineChart { / TimelineConstants.MEGA_DOUBLE; String fileName = (String)row.get(ScreenShotDBTable.COLUMN.IMAGE_FILE_PATH.ordinal()); int orientation = (Integer)row.get(ScreenShotDBTable.COLUMN.IMAGE_ORIENTATION.ordinal()); - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } - String imagePath = AnalyzerManager.getProject().getSavePath() + String imagePath = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + AnalyzerConstants.SMALL_IMAGE_FOLDER_NAME diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java index 7fc9c0d..b66bfde 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java @@ -34,7 +34,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -107,11 +107,11 @@ public class SystemMemoryChart extends TimelineChart { systemSeries.clear(); totalSeries.clear(); - if (AnalyzerManager.getProject() == null) { + if (Global.getProject() == null) { return; } - long systemMemorySize = AnalyzerManager.getProject() + long systemMemorySize = Global.getProject() .getDeviceStatusInfo().getSystemMemorySize(); @SuppressWarnings("unchecked") diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java index 8a5395c..001f4b1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java @@ -34,7 +34,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.constant.CommonConstants; @@ -338,7 +337,7 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer } private void makeSystemDataTableData(Logs systemLogs, Logs memoryLogs) { - int coreSize = AnalyzerManager.getProject().getDeviceStatusInfo().getCpuCount(); + int coreSize = Global.getProject().getDeviceStatusInfo().getCpuCount(); List memoryLogList = memoryLogs == null ? null : memoryLogs.getRawLogs(); List systemLogList = systemLogs == null ? null : systemLogs.getRawLogs(); @@ -360,7 +359,7 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer * Check library allocation */ String binaryPath = null; - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); ProcessMemoryMap pmap = project.getProcessInformation(logData.getPid()).getProcessMemoryMap( logData.getTime()); LibraryObject lib = pmap.getLibraryByAddress(logData.getCallerPcAddr()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java index 5078add..347d46b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.graphics.Color; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -108,14 +108,14 @@ public class LifecycleLogParser { Color color; String text; - if(AnalyzerManager.getProject() == null) { + if(Global.getProject() == null) { return; } /* * TODO need to check detail application type */ // EFL - if (AnalyzerManager.getProject().getApplicationInfo().getAppType(). + if (Global.getProject().getApplicationInfo().getAppType(). contains(AppInfo.APPTYPE_CAPP)) { if (apiId == API_ID_INITIALIZING_EFL) { Logger.performance("TEST", "EFL App Lifecycle", "Initializing"); @@ -139,7 +139,7 @@ public class LifecycleLogParser { } } // OSP - else if (AnalyzerManager.getProject().getApplicationInfo().getAppType(). + else if (Global.getProject().getApplicationInfo().getAppType(). contains(AppInfo.APPTYPE_CPP)) { if (apiId == API_ID_INITIALIZING_OSP) { Logger.performance("TEST", "OSP App Lifecycle", "Initializing"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java index 2259aea..cd1d266 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.WidgetLabels; @@ -214,7 +214,7 @@ public class SaveAsDialog extends DAMessageBox { }; private String getDefaultSaveFileName() { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); String sourcePath = project.getSavePath(); String[] splitSourcePath = null; if (CommonUtil.isWin()) { 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 71050b5..66e37fd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java @@ -29,7 +29,7 @@ package org.tizen.dynamicanalyzer.ui.toolbar; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.logparser.LogParser; import org.tizen.dynamicanalyzer.project.Project; @@ -68,7 +68,7 @@ public class StopLogProcessor implements Runnable { @Override public void run() { Logger.performanceSubThreadStart("TEST", "DA end", "Run stop log process thread"); - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); int percent = 0; int exitCount = 0; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java index 5b16090..59524ec 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java @@ -163,7 +163,7 @@ public class ToolbarArea { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - Project p = AnalyzerManager.getProject(); + Project p = Global.getProject(); if (null == p || !p.isValid() || !enabled) { replayButton.setButtonEnabled(false); replayEditButton.setButtonEnabled(false); @@ -315,7 +315,7 @@ public class ToolbarArea { @Override public void handleEvent(Event event) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (null == project) { return; } @@ -508,7 +508,7 @@ public class ToolbarArea { public void stopTrace() { ShortCutManager.getInstance().setEnabled(false); - AnalyzerManager.getProject().setReplayStopTime(getTime()); + Global.getProject().setReplayStopTime(getTime()); AnalyzerManager.setRunningState(false); AnalyzerManager.stopScreenshotTimer(); TraceStartStopThread.runStartStopThread(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java index 04a85ea..68579ce 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/TraceStartStopThread.java @@ -27,7 +27,7 @@ package org.tizen.dynamicanalyzer.ui.toolbar; -import static org.tizen.dynamicanalyzer.common.AnalyzerConstants.*; +import static org.tizen.dynamicanalyzer.common.AnalyzerConstants.START_STOP_THREAD; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java index 9d0edc4..b3ad87f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java @@ -27,18 +27,12 @@ package org.tizen.dynamicanalyzer.ui.toolbar.opentrace; -import java.util.List; - import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.project.Project; -import org.tizen.dynamicanalyzer.sql.SqlManager; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.logparser.Logs; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.util.Logger; public class OpenTraceInputReader implements Runnable { @@ -77,7 +71,7 @@ public class OpenTraceInputReader implements Runnable { @Override public void run() { AnalyzerManager.setLogParsingComplete(false); - Project p = AnalyzerManager.getProject(); + Project p = Global.getProject(); // deprecated // createPackage(p.getDeviceLogCount(), diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java index abd392c..4dfd912 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceProgressManager.java @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.handlers.ClearHandler; import org.tizen.dynamicanalyzer.handlers.OpenTraceCompleteHandler; import org.tizen.dynamicanalyzer.handlers.OpenTraceHandler; @@ -208,7 +209,7 @@ public class OpenTraceProgressManager implements Runnable { public void run() { AnalyzerUtil.executeCommand(ClearHandler.ID); Project project = new Project(); - AnalyzerManager.setProjectNoRegist(project); + Global.setProject(project); project.setSavePath(getInstance().getSavePath()); AnalyzerUtil.executeCommand(OpenTraceHandler.ID); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java index ed09d5d..e5da913 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/SaveFilesTable.java @@ -34,7 +34,7 @@ import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; @@ -125,7 +125,7 @@ public class SaveFilesTable extends DATableComposite { String path = PathManager.DA_SAVE_PATH + File.separator + text.get(TRACE_NAME_INDEX); - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (null != project) { String projectPath = project.getSavePath(); if (path.equals(projectPath)) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java index 3fa8ad0..1a038c2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/TempFilesTable.java @@ -33,7 +33,7 @@ import java.util.List; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.TableInput; @@ -102,7 +102,7 @@ public class TempFilesTable extends DATableComposite { String path = PathManager.DA_TEMP_FOLDER_PATH + File.separator + text.get(TRACE_NAME_INDEX); - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (null != project) { String projectPath = project.getSavePath(); if (path.equals(projectPath)) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java index b714ff5..4c95ef0 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java @@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; @@ -214,7 +214,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { }; private String getSaveFileName() { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); String sourcePath = project.getSavePath(); String[] splitSourcePath = null; if (CommonUtil.isWin()) { @@ -244,11 +244,11 @@ public class RepalyEditSaveDialog extends DAMessageBox { } private boolean executeSaveTrace() { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); String sourcePath = project.getSavePath(); targetPath = PathManager.DA_SAVE_PATH + File.separator + saveFileName; - if (AnalyzerManager.getProject().getSavePath().equals(targetPath)) { + if (Global.getProject().getSavePath().equals(targetPath)) { return true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java index 09889e8..49621d4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.swt.widgets.Shell; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.ReplayEditLabels; import org.tizen.dynamicanalyzer.swap.model.DATime; @@ -342,7 +342,7 @@ public class ReplayEditDialogDataManager { } public long getTimeValue(long sec, long nano) { - DATime startTime = AnalyzerManager.getProject().getProfilingStartTime(); + DATime startTime = Global.getProject().getProfilingStartTime(); long startSec = startTime.getSec(); long startNano = startTime.getNano(); long resultSec = sec - startSec; @@ -352,7 +352,7 @@ public class ReplayEditDialogDataManager { } private DATime getDATimeValue(long time) { - DATime startTime = AnalyzerManager.getProject().getProfilingStartTime(); + DATime startTime = Global.getProject().getProfilingStartTime(); long startSec = startTime.getSec(); long startNano = startTime.getNano(); long delaySec = time / (1000 * 1000); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java index dd1e03c..05ac29a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java @@ -36,6 +36,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; @@ -60,7 +61,7 @@ public class ReplayEditScreenshotTable extends DATableComposite { if (i == 0) { path = AnalyzerConstants.DEFAULT_IMAGE_NAME; } else { - path = AnalyzerManager.getProject().getSavePath() + path = Global.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + image.getFileName(); } 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 840fbc7..004dec8 100644 --- 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 @@ -29,6 +29,7 @@ package org.tizen.dynamicanalyzer.ui.userinterface.profiling; import java.util.ArrayList; import java.util.List; + import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/WindowingTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/WindowingTable.java index 11c51b2..8a47da5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/WindowingTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/WindowingTable.java @@ -293,7 +293,7 @@ public class WindowingTable extends Composite { // int tableItemIndex = 0; // int tableRowSize = table.getItemCount(); // - // if (null == AnalyzerManager.getProject()) { + // if (null == Global.getProject()) { // return; // } // diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index e528a1f..919035b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.handlers.IHandlerService; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.ProcessInformation; @@ -384,10 +384,10 @@ public class AnalyzerUtil { } public static String getProcessLocalBinaryPath(int pid, long time) { - ProcessMemoryMap pmap = AnalyzerManager.getProject().getProcessInformation(pid) + ProcessMemoryMap pmap = Global.getProject().getProcessInformation(pid) .getProcessMemoryMap(time); if (null != pmap) { - return AnalyzerManager.getProject().getDeviceStatusInfo() + return Global.getProject().getDeviceStatusInfo() .getBinaryInfo(pmap.getMainbinary().getBinaryID()) .getTargetBinaryPath(); } else { @@ -396,10 +396,10 @@ public class AnalyzerUtil { } public static String getBinarySourcePath(int pid, long time) { - ProcessMemoryMap pmap = AnalyzerManager.getProject().getProcessInformation(pid) + ProcessMemoryMap pmap = Global.getProject().getProcessInformation(pid) .getProcessMemoryMap(time); if (null != pmap) { - return AnalyzerManager.getProject().getDeviceStatusInfo() + return Global.getProject().getDeviceStatusInfo() .getBinaryInfo(pmap.getMainbinary().getBinaryID()) .getTempBinaryPath(); } else { @@ -409,13 +409,13 @@ public class AnalyzerUtil { // need to be refactored public static boolean isPieBuild(int pid, long time) { - ProcessMemoryMap pmap = AnalyzerManager.getProject().getProcessInformation(pid) + ProcessMemoryMap pmap = Global.getProject().getProcessInformation(pid) .getProcessMemoryMap(time); if (null == pmap) { return false; } - BinaryInfo binInfo = AnalyzerManager.getProject().getDeviceStatusInfo() + BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo() .getBinaryInfo(pmap.getMainbinary().getBinaryID()); if (null == binInfo || binInfo.getType() != 1) { return false; @@ -441,7 +441,7 @@ public class AnalyzerUtil { } public static String getProcessName(int pid) { - Project project = AnalyzerManager.getProject(); + Project project = Global.getProject(); if (project == null) { return null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java index 8b86fd9..6312619 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java @@ -33,7 +33,7 @@ import java.io.FileReader; import java.io.IOException; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.util.CommonUtil; @@ -71,13 +71,13 @@ public class DownloadContentfileManager { String downloadFolderPath = File.separator + AnalyzerConstants.DOWNLOAD_FILE_FOLDER; - makeFolder(AnalyzerManager.getProject().getSavePath() + makeFolder(Global.getProject().getSavePath() + downloadFolderPath); String saveFilePath = downloadFolderPath + File.separator + fileNameSplit[SPLIT_PATH_INDEX]; - if (pullFile(deviceFilePath, AnalyzerManager.getProject() + if (pullFile(deviceFilePath, Global.getProject() .getSavePath() + saveFilePath)) { returnString = saveFilePath; } @@ -121,7 +121,7 @@ public class DownloadContentfileManager { + File.separator)) { StringBuffer contextsBuffer = new StringBuffer(); - String filePath = AnalyzerManager.getProject().getSavePath() + String filePath = Global.getProject().getSavePath() + contents; File contentsFile = new File(filePath); if (contentsFile.isFile()) {