From a00fe1213ba138bee11ab6416a7560187ffd0d9a Mon Sep 17 00:00:00 2001 From: greatim Date: Fri, 28 Mar 2014 21:57:25 +0900 Subject: [PATCH] [Title] refactoring 4 (page and view component and page data manager threads) [Desc.] [Issue] --- .../META-INF/MANIFEST.MF | 3 +- .../appearance/DesignConstants.java | 4 +- .../widgets/da/view/DABaseComposite.java | 39 + .../widgets/da/view/DAPageComposite.java | 130 ++ .../widgets/da/view}/DATabButton.java | 91 +- .../widgets/da/view}/DATabComposite.java | 433 ++--- .../widgets/da/view/DAViewComposite.java | 119 +- .../widgets/da/view/DAViewData.java | 27 + .../widgets/da/view}/TabButtonRenderer.java | 6 +- .../dynamicanalyzer/common/AnalyzerConstants.java | 10 +- .../dynamicanalyzer/common/AnalyzerManager.java | 14 +- .../dynamicanalyzer/common/DASelectionData.java | 46 +- ...shotConstants.java => ScreenshotConstants.java} | 6 +- .../communicator/Communicator22.java | 23 +- .../handlers/OpenTraceCompleteHandler.java | 6 +- .../dynamicanalyzer/handlers/OpenTraceHandler.java | 10 +- .../dynamicanalyzer/handlers/StartHandler.java | 18 +- .../dynamicanalyzer/handlers/StopHandler.java | 17 +- .../listeners/SummaryMouseDoubleClickListener.java | 22 +- .../logparser/LogCenterConstants.java | 4 +- .../tizen/dynamicanalyzer/logparser/LogParser.java | 4 +- .../org/tizen/dynamicanalyzer/model/DAView.java | 135 -- .../tizen/dynamicanalyzer/model/DeviceInfo.java | 4 +- .../shortcut/ShortCutKeyBindingHandler.java | 18 +- .../org/tizen/dynamicanalyzer/sql/SqlManager.java | 2 +- .../swap/callstack/SWAPCallStackManager.java | 1 - .../swap/communicator/Communicator30.java | 24 +- .../swap/logparser/DataManagerRegistry.java | 54 + .../swap/logparser/PageDataManager.java | 55 + .../logparser/ReadBlockingQueue.java} | 13 +- .../swap/logparser/SWAPLogParser.java | 58 +- .../ui/common/TimelineChartMouseEventListener.java | 32 +- .../dynamicanalyzer/ui/file/FileApiListTable.java | 32 +- .../dynamicanalyzer/ui/file/FileApiListView.java | 95 +- .../dynamicanalyzer/ui/file/FileChartManager.java | 69 +- .../dynamicanalyzer/ui/file/FileChartView.java | 100 +- .../ui/file/FileDetailInfoView.java | 25 +- .../tizen/dynamicanalyzer/ui/file/FilePage.java | 53 +- .../ui/info/callstack/CallstackTable.java | 30 +- .../ui/info/callstack/CallstackView.java | 40 +- .../dynamicanalyzer/ui/info/score/ScoreView.java | 15 +- .../EmulatorScreenshot.java} | 14 +- .../ui/info/{snapshot => screenshot}/EventMgr.java | 2 +- .../ui/info/{snapshot => screenshot}/ILsn.java | 2 +- .../ui/info/{snapshot => screenshot}/IMessage.java | 2 +- .../ui/info/{snapshot => screenshot}/IMsgProc.java | 4 +- .../ui/info/{snapshot => screenshot}/IconView.java | 2 +- .../info/{snapshot => screenshot}/ImageViewer.java | 90 +- .../info/{snapshot => screenshot}/ListenMap.java | 2 +- .../info/{snapshot => screenshot}/ListenSet.java | 2 +- .../{snapshot => screenshot}/MessageQueue.java | 4 +- .../{snapshot => screenshot}/MessageSender.java | 10 +- .../ui/info/{snapshot => screenshot}/MsgMgr.java | 6 +- .../MsgProc_KeepAliveReq.java | 4 +- .../MsgProc_MonitorNtf.java | 6 +- .../ui/info/screenshot/ScreenshotDataManager.java | 71 + .../ScreenshotTimerTask.java | 2 +- .../ScreenshotView.java} | 164 +- .../{snapshot => screenshot}/SocketClient.java | 2 +- .../{snapshot => screenshot}/SocketConstants.java | 2 +- .../{snapshot => screenshot}/SocketMessage.java | 4 +- .../{snapshot => screenshot}/SocketReceive.java | 4 +- .../ui/info/{snapshot => screenshot}/ecs/Ecs.java | 1678 ++++++++++---------- .../info/{snapshot => screenshot}/ecs/EcsIds.java | 6 +- .../ui/kernel/CallFlowChartView.java | 69 +- .../ui/kernel/CallFlowTabComposite.java | 38 - .../ui/kernel/ContextSwitchingChartView.java | 44 +- .../dynamicanalyzer/ui/kernel/KernelListTable.java | 4 +- .../dynamicanalyzer/ui/kernel/KernelListView.java | 57 +- .../dynamicanalyzer/ui/kernel/KernelPage.java | 69 +- .../ui/kernel/KernelStatisticInfoView.java | 18 +- .../ui/kernel/data/ContextDataDBInserter.java | 3 +- .../ui/kernel/data/FunctionDataDBInserter.java | 3 +- .../ui/kernel/data/KernelDataManager.java | 50 +- .../ui/network/NetworkApiListTable.java | 34 +- .../ui/network/NetworkApiListView.java | 109 +- .../ui/network/NetworkChartManager.java | 72 +- .../ui/network/NetworkChartView.java | 109 +- .../ui/network/NetworkDetailInfoView.java | 30 +- .../dynamicanalyzer/ui/network/NetworkPage.java | 53 +- .../ui/opengl/data/GLDataMaker.java | 1276 +++++++++------ .../ui/opengl/data/GLSelectionData.java | 8 +- .../GLFrameChartMouseEventListener.java | 26 +- .../GLTimeChartMouseEventListener.java | 37 +- .../ui/opengl/ui/GLDetailsView.java | 105 +- .../tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java | 71 +- .../ui/opengl/ui/apiList/GLAPIListTable.java | 73 +- .../ui/opengl/ui/apiList/GLAPIListView.java | 154 +- .../ui/opengl/ui/chart/GLChartView.java | 126 +- .../ui/opengl/ui/context/GLContextTreeTable.java | 20 +- .../ui/opengl/ui/context/GLContextView.java | 118 +- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 28 +- .../dynamicanalyzer/ui/page/DAPageComposite.java | 218 --- .../ui/page/ScreenshotTabComposite.java | 49 + .../tizen/dynamicanalyzer/ui/page/ViewAction.java | 52 - .../dynamicanalyzer/ui/range/RangeDataManager.java | 36 +- .../ui/range/RangeFailedApiListView.java | 3 +- .../dynamicanalyzer/ui/range/RangeLeakView.java | 4 +- .../tizen/dynamicanalyzer/ui/range/RangePage.java | 56 +- .../ui/range/RangeProfilingView.java | 10 +- .../ui/range/RangeWarningDetailView.java | 3 +- .../ui/range/RangeWarningListView.java | 3 +- .../dynamicanalyzer/ui/summary/SummaryPage.java | 67 +- .../ui/summary/failed/FailedApiListView.java | 31 +- .../ui/summary/failed/FailedApiTable.java | 13 +- .../ui/summary/leaks/LeakTable.java | 16 +- .../dynamicanalyzer/ui/summary/leaks/LeakView.java | 37 +- .../summary/profiling/FunctionUsageProfiler.java | 117 +- .../profiling/FunctionUsageProfilingView.java | 47 +- .../ui/summary/profiling/ProfilingTable.java | 17 +- .../ui/summary/warning/WarningDetailView.java | 64 +- .../ui/summary/warning/WarningListView.java | 80 +- .../ui/summary/warning/WarningTable.java | 15 +- .../ui/thread/ThreadAPIListTable.java | 56 +- .../ui/thread/ThreadAPIListView.java | 76 +- .../ui/thread/ThreadChartManager.java | 116 +- .../dynamicanalyzer/ui/thread/ThreadChartView.java | 109 +- .../ui/thread/ThreadDetailInfoView.java | 46 +- .../dynamicanalyzer/ui/thread/ThreadPage.java | 51 +- .../dynamicanalyzer/ui/timeline/TimelinePage.java | 49 +- .../ui/timeline/calltrace/CallTraceTable.java | 10 +- .../ui/timeline/calltrace/CallTraceView.java | 61 +- .../ui/timeline/chart/ScreenshotChart.java | 4 +- .../ui/timeline/common/TimelineChartManager.java | 83 +- .../ui/timeline/common/TimelineView.java | 138 +- .../ui/timeline/logparser/CustomLogParser.java | 7 +- .../ui/timeline/logparser/DeviceLogParser.java | 7 +- .../ui/timeline/uievent/UIEventListDialog.java | 26 +- .../ui/toolbar/ConfigureManager.java | 4 +- .../ui/toolbar/StopLogProcessor.java | 25 +- .../ui/toolbar/StopProcessManager.java | 2 +- .../dynamicanalyzer/ui/toolbar/ToolbarArea.java | 4 +- .../ui/toolbar/UpdateTimerTask.java | 4 +- .../toolbar/configuration/BinarySettingsPage.java | 7 +- .../toolbar/configuration/ConfigurationDialog.java | 10 +- .../ConfigurationDialogDataManager.java | 4 +- .../ConfigurationDialogFeaturesPage.java | 13 +- .../ConfigurationDialogSettingPage.java | 28 +- .../ui/toolbar/opentrace/OpenTraceInputReader.java | 8 +- .../opentrace/OpenTraceProgressManager.java | 19 +- ...Dialog.java => ReplayEditScreenshotDialog.java} | 56 +- ...otTable.java => ReplayEditScreenshotTable.java} | 4 +- .../ReplayEditSnapShopTableCellRenderer.java | 6 +- .../ui/toolbar/replayEditor/ReplayEditTable.java | 2 +- .../toolbar/replayEditor/ReplayEditTableView.java | 18 +- .../ui/userinterface/UIDataManager.java | 119 +- .../dynamicanalyzer/ui/userinterface/UIPage.java | 62 +- .../userinterface/control/UIControlListTable.java | 19 +- .../userinterface/control/UIControlListView.java | 56 +- .../profiling/UIFunctionProfilingTable.java | 13 +- .../profiling/UIFunctionProfilingView.java | 63 +- .../ui/userinterface/scene/UISceneDataChecker.java | 2 +- .../ui/userinterface/scene/UISceneListTable.java | 15 +- .../ui/userinterface/scene/UISceneListView.java | 52 +- .../dynamicanalyzer/ui/widgets/FindDialog.java | 1 - .../tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 12 +- .../org/tizen/dynamicanalyzer/utils/JsonUtil.java | 2 +- 157 files changed, 4508 insertions(+), 4673 deletions(-) create mode 100644 org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DABaseComposite.java create mode 100644 org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAPageComposite.java rename {org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets => org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view}/DATabButton.java (64%) rename {org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets => org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view}/DATabComposite.java (61%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java => org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java (66%) mode change 100644 => 100755 create mode 100644 org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewData.java rename {org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets => org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view}/TabButtonRenderer.java (97%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/{SnapshotConstants.java => ScreenshotConstants.java} (94%) delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DAView.java create mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/DataManagerRegistry.java create mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/{ui/kernel/data/KernelBlockingQueue.java => swap/logparser/ReadBlockingQueue.java} (82%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot/EmulatorSnapshot.java => screenshot/EmulatorScreenshot.java} (87%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/EventMgr.java (97%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ILsn.java (95%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/IMessage.java (95%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/IMsgProc.java (89%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/IconView.java (98%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ImageViewer.java (85%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ListenMap.java (96%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ListenSet.java (96%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/MessageQueue.java (93%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/MessageSender.java (87%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/MsgMgr.java (93%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/MsgProc_KeepAliveReq.java (90%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/MsgProc_MonitorNtf.java (86%) create mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ScreenshotTimerTask.java (80%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot/SnapshotView.java => screenshot/ScreenshotView.java} (77%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/SocketClient.java (98%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/SocketConstants.java (97%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/SocketMessage.java (94%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/SocketReceive.java (95%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ecs/Ecs.java (82%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/{snapshot => screenshot}/ecs/EcsIds.java (97%) delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/DAPageComposite.java create mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ViewAction.java rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/{ReplayEditSnapshotDialog.java => ReplayEditScreenshotDialog.java} (81%) rename org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/{ReplayEditSnapshotTable.java => ReplayEditScreenshotTable.java} (95%) diff --git a/org.tizen.dynamicanalyzer.appearance/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer.appearance/META-INF/MANIFEST.MF index 036482b..47797fb 100644 --- a/org.tizen.dynamicanalyzer.appearance/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer.appearance/META-INF/MANIFEST.MF @@ -13,4 +13,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.tizen.dynamicanalyzer.appearance, org.tizen.dynamicanalyzer.nl, org.tizen.dynamicanalyzer.resources, - org.tizen.dynamicanalyzer.widgets.da.base + org.tizen.dynamicanalyzer.widgets.da.base, + org.tizen.dynamicanalyzer.widgets.da.view diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/appearance/DesignConstants.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/appearance/DesignConstants.java index f7e0580..aa35483 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/appearance/DesignConstants.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/appearance/DesignConstants.java @@ -39,8 +39,8 @@ public class DesignConstants { public static final int COMBO_APP_HEIGHT = 24; public static final int COMBO_APP_WIDTH = 145; - public static final int SNAPSHOT_VIEW_WIDTH = 220; - public static final int SNAPSHOT_VIEW_HEIGHT = 315 ; + public static final int SCREENSHOT_VIEW_WIDTH = 220; + public static final int SCREENSHOT_VIEW_HEIGHT = 315 ; public static final int DA_BUTTON_HEIGHT = 28; public static final int DA_BUTTON_WIDTH = 100; diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DABaseComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DABaseComposite.java new file mode 100644 index 0000000..9673c20 --- /dev/null +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DABaseComposite.java @@ -0,0 +1,39 @@ +package org.tizen.dynamicanalyzer.widgets.da.view; + +import org.eclipse.swt.widgets.Composite; +import org.tizen.dynamicanalyzer.constant.CommonConstants; + +public abstract class DABaseComposite extends Composite { + protected String ID = null; + protected String title = CommonConstants.EMPTY; + + public DABaseComposite(Composite parent, int style) { + super(parent, style); + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getID() { + return ID; + } + + public void setID(String id) { + this.ID = id; + } + + public abstract void clear(); + + public abstract void updateView(); + + public abstract void updateView(DAViewData data); + + protected abstract boolean isContainer(); + + public abstract DABaseComposite getView(String viewid); +} diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAPageComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAPageComposite.java new file mode 100644 index 0000000..4b44265 --- /dev/null +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAPageComposite.java @@ -0,0 +1,130 @@ +package org.tizen.dynamicanalyzer.widgets.da.view; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.swt.events.ControlEvent; +import org.eclipse.swt.events.ControlListener; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Composite; + +/* page composite represent a page. + * page composite cannot be used for the other purpose. + */ + +// abstract view class cannot have ID + +public abstract class DAPageComposite extends DABaseComposite { + public static final String KEY_TOOLTIP = "tooltip"; + + private HashMap childMap = null; + private DAViewData selection = null; + private boolean isToplevel = true; + + public DAPageComposite(Composite parent, int style) { + super(parent, style); + construct(); + } + + public DAPageComposite(Composite parent, int style, boolean istoplevel) { + super(parent, style); + this.isToplevel = istoplevel; + construct(); + } + + private void construct() { + childMap = new HashMap(); + this.addControlListener(new ControlListener() { + + @Override + public void controlResized(ControlEvent e) { + Composite composite = (Composite) e.widget; + Rectangle rect = composite.getBounds(); + + onResized(rect.width, rect.height); + } + + @Override + public void controlMoved(ControlEvent e) { + } + }); + } + + public boolean addView(DABaseComposite view) { + return addView(view.getID(), view); + } + + public boolean addView(String viewId, DABaseComposite view) { + if (null == viewId || viewId.isEmpty()) { + viewId = view.getClass().getName(); + } + view.setID(viewId); + + if (null != childMap.get(viewId)) { + return false; + } else { + childMap.put(viewId, view); + return true; + } + } + + @Override + public DABaseComposite getView(String viewId) { + DABaseComposite view = childMap.get(viewId); + if (view == null) { + for (Map.Entry entry : childMap.entrySet()) { + DABaseComposite entryComp = entry.getValue(); + if (entryComp.isContainer()) { + view = entryComp.getView(viewId); + if (view != null) + break; + } + } + } + + return view; + } + + public void setSelection(DAViewData sel) { + selection = sel; + } + + public DAViewData getSelection() { + return selection; + } + + public boolean isToplevel() { + return isToplevel; + } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + } + + @Override + public void updateView(DAViewData data) { + String viewid = data.getViewID(); + for (Map.Entry entry : childMap.entrySet()) { + if (!entry.getKey().equals(viewid)) + entry.getValue().updateView(data); + } + } + + @Override + public void clear() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().clear(); + } + } + + protected void onResized(int width, int height) { + } + + @Override + protected boolean isContainer() { + return true; + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabButton.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java similarity index 64% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabButton.java rename to org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java index 7406c4f..58ecbfd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabButton.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java @@ -23,7 +23,7 @@ * - S-Core Co., Ltd * */ -package org.tizen.dynamicanalyzer.ui.widgets; +package org.tizen.dynamicanalyzer.widgets.da.view; import java.util.ArrayList; import java.util.List; @@ -41,19 +41,13 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; public class DATabButton extends DACustomButton { - - public static final int CLOSE_NORMAL = 0; - public static final int CLOSE_PUSH = 1; - public static final int CLOSE_HOVER = 2; - public static final int CLOSE_DISABLE = 3; - private List closeImages = null; private boolean closable = false; + private boolean isAnimating = false; - protected int closeState = STATE_NORMAL; -// protected TabButtonRenderer tabRenderer; - protected Rectangle closeRect = null; - protected DACustomButtonClickEventListener closeListener = null; + private int closeButtonState = STATE_NORMAL; + private Rectangle closeButtonRect = null; + private DACustomButtonClickEventListener closeButtonListener = null; public DATabButton(Composite parent, int style) { super(parent, ColorResources.TAB_NORMAL_COLOR_START, @@ -66,12 +60,12 @@ public class DATabButton extends DACustomButton { ColorResources.TAB_SELECTED_COLOR_END); this.setLayout(new FormLayout()); - this.addListener(SWT.MouseMove, tabMouseListener); - this.addListener(SWT.MouseDown, tabMouseListener); - this.addListener(SWT.MouseUp, tabMouseListener); + this.addListener(SWT.MouseMove, tbMouseEventListener); + this.addListener(SWT.MouseDown, tbMouseEventListener); + this.addListener(SWT.MouseUp, tbMouseEventListener); } - private Listener tabMouseListener = new Listener() { + private Listener tbMouseEventListener = new Listener() { @Override public void handleEvent(Event event) { @@ -81,48 +75,47 @@ public class DATabButton extends DACustomButton { } int type = event.type; - if (null == closeRect) { - Rectangle imgRect = button.getCloseImage().getBounds(); + if (null == closeButtonRect) { + Rectangle imgRect = button.getCloseButtonImage().getBounds(); Rectangle rect = button.getBounds(); - closeRect = new Rectangle(rect.width - imgRect.width - 2, + closeButtonRect = new Rectangle(rect.width - imgRect.width - 2, (rect.height - imgRect.height) / 2, imgRect.width, imgRect.height); } if (type == SWT.MouseMove) { if (state == STATE_DISABLE) { - if (closeRect.contains(event.x, event.y)) { - button.setCloseState(STATE_HOVER); + if (closeButtonRect.contains(event.x, event.y)) { + button.setCloseButtonState(STATE_HOVER); } else { - button.setCloseState(STATE_NORMAL); + button.setCloseButtonState(STATE_NORMAL); } } else if (state == STATE_NORMAL) { - button.setCloseState(STATE_DISABLE); + button.setCloseButtonState(STATE_DISABLE); } else if (state == STATE_HOVER) { - if (closeRect.contains(event.x, event.y)) { - button.setCloseState(STATE_HOVER); + if (closeButtonRect.contains(event.x, event.y)) { + button.setCloseButtonState(STATE_HOVER); } else { - button.setCloseState(STATE_DISABLE); + button.setCloseButtonState(STATE_DISABLE); } } } else if (type == SWT.MouseDown) { if (state == STATE_DISABLE) { - if (closeRect.contains(event.x, event.y)) { - button.setCloseState(STATE_PUSH); + if (closeButtonRect.contains(event.x, event.y)) { + button.setCloseButtonState(STATE_PUSH); } } } else if (type == SWT.MouseUp) { - if (closeRect.contains(event.x, event.y)) { - button.setCloseState(STATE_HOVER); - if (null != closeListener) { - closeListener.handleClickEvent(null); + if (closeButtonRect.contains(event.x, event.y)) { + button.setCloseButtonState(STATE_HOVER); + if (null != closeButtonListener && !isAnimating) { + closeButtonListener.handleClickEvent(null); } } else { - button.setCloseState(STATE_NORMAL); + button.setCloseButtonState(STATE_NORMAL); } } } - }; private List getCloseImages() { @@ -136,8 +129,13 @@ public class DATabButton extends DACustomButton { return closeImages; } - public Image getCloseImage() { - return getCloseImages().get(closeState); + private void setCloseButtonState(int state) { + closeButtonState = state; + this.redraw(); + } + + public Image getCloseButtonImage() { + return getCloseImages().get(closeButtonState); } public void setClosable(boolean enabled) { @@ -148,27 +146,22 @@ public class DATabButton extends DACustomButton { return closable; } - public int getCloseState() { - return closeState; - } - - public void setCloseState(int state) { - closeState = state; - this.redraw(); - } - - protected void changeButtonState(int state) { + public void changeButtonState(int state) { this.state = state; - if (state == STATE_NORMAL) { - closeState = STATE_DISABLE; + if (state == STATE_NORMAL || state == STATE_HOVER) { + closeButtonState = STATE_DISABLE; } else { - closeState = STATE_NORMAL; + closeButtonState = STATE_NORMAL; } this.redraw(); } public void addCloseButtonListener(DACustomButtonClickEventListener listener) { - closeListener = listener; + closeButtonListener = listener; + } + + public void setAnimating(boolean animating) { + isAnimating = animating; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java similarity index 61% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabComposite.java rename to org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java index 8bcd82f..9990cc0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabComposite.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java @@ -24,11 +24,10 @@ * */ -package org.tizen.dynamicanalyzer.ui.widgets; +package org.tizen.dynamicanalyzer.widgets.da.view; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -43,60 +42,62 @@ import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.appearance.DesignConstants; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.page.ViewAction; -import org.tizen.dynamicanalyzer.ui.range.RangePage; -import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; -public class DATabComposite extends DAView { - - public static final String ID = DATabComposite.class.getName(); +public class DATabComposite extends DABaseComposite { public static final int LONG_TAB_WIDTH = 70; public static final int SHORT_TAB_WIDTH = 70; - // flag for animation - public static boolean showState = false; - - private List buttons = null; - private List children = null; - private HashMap childrenMap = null; - private HashMap buttonMap = null; + protected boolean isToplevel = false; + private List buttons = null; + private List children = null; private Composite tabComposite = null; private Composite contentsComposite = null; - private StackLayout stackLayout = null; - + private StackLayout contentsStackLayout = null; + + private Control lasttab = null; + + // drag for tab button private DATabButton sourceButton = null; private int targetButtonIndex = -1; private int sourceButtonIndex = -1; - private boolean drag = false; - + private int tabWidth = LONG_TAB_WIDTH; + { + ID = DATabComposite.class.getName(); + } + public DATabComposite(Composite parent, int style) { super(parent, style); - childrenMap = new HashMap(); - buttonMap = new HashMap(); + construct(); + } + + public DATabComposite(Composite parent, int style, boolean istoplevel) { + super(parent, style); + this.isToplevel = istoplevel; + construct(); + } + + private void construct() { + buttons = new ArrayList(); + children = new ArrayList(); tabComposite = new Composite(this, SWT.DOUBLE_BUFFERED); tabComposite.setLayout(new FormLayout()); contentsComposite = new Composite(this, SWT.DOUBLE_BUFFERED); - stackLayout = new StackLayout(); - contentsComposite.setLayout(stackLayout); + contentsStackLayout = new StackLayout(); + contentsComposite.setLayout(contentsStackLayout); this.setLayout(new FormLayout()); FormData data = new FormData(); @@ -115,36 +116,49 @@ public class DATabComposite extends DAView { contentsComposite.setLayoutData(data); } - public DATabButton addView(String childId, Composite child, + private PaintListener tabCompositePaintListener = new PaintListener() { + + @Override + public void paintControl(PaintEvent e) { + Composite comp = (Composite) e.widget; + Rectangle rect = comp.getClientArea(); + e.gc.setForeground(ColorResources.TAB_BG_COLOR_START); + e.gc.setBackground(ColorResources.TAB_BG_COLOR_END); + e.gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height, + true); + e.gc.setForeground(ColorResources.TAB_BG_OUTLINE_COLOR); + e.gc.drawRectangle(rect); + } + }; + + public DATabButton addView(String childId, DABaseComposite child, boolean usingAnimation) { return addView(childId, child, usingAnimation, false); } - public DATabButton addView(String childId, Composite child) { + public DATabButton addView(String childId, DABaseComposite child) { return addView(childId, child, false, false); } - public DATabButton addView(Composite child, boolean usingAnimation) { + public DATabButton addView(DABaseComposite child, boolean usingAnimation) { return addView(null, child, usingAnimation, false); } - public DATabButton addView(Composite child) { + public DATabButton addView(DABaseComposite child) { return addView(null, child, false, false); } - public DATabButton addView(String childId, Composite child, + public DATabButton addView(String childId, DABaseComposite child, boolean usingAnimation, boolean closeable) { - if (!(child instanceof ViewAction)) { - return null; - } - String ID = null; if (null == childId || childId.isEmpty()) { ID = child.getClass().getName(); } else { ID = childId; } - String title = ((ViewAction) child).getViewName(); + child.setID(ID); + + String title = child.getTitle(); final DATabButton tabButton = new DATabButton(tabComposite, SWT.NONE); tabButton.setFontColors(ColorResources.TAB_NORMAL_FONT_COLOR, @@ -166,9 +180,9 @@ public class DATabComposite extends DAView { data.top = new FormAttachment(0, 0); data.bottom = new FormAttachment(100, 0); - if (getButtons().size() > 0) { - DACustomButton button1 = getButtons().get(getButtons().size() - 1); - data.left = new FormAttachment(button1, 0); + if (buttons.size() > 0) { + DATabButton lastbutton = buttons.get(buttons.size() - 1); + data.left = new FormAttachment(lastbutton, 0); if (!usingAnimation) { data.width = tabWidth; // short } @@ -180,77 +194,88 @@ public class DATabComposite extends DAView { } tabButton.setLayoutData(data); - final Composite tempChild = child; + final DABaseComposite finalChild = child; Listener tabMoveEvent = new Listener() { @Override public void handleEvent(Event event) { - Point cursorLocation = tabComposite.getDisplay().getCurrent().getCursorLocation(); + Point cursorLocation = Display.getCurrent().getCursorLocation(); Point curPosition = tabComposite.toControl(cursorLocation); - - switch(event.type) { + + switch (event.type) { case SWT.MouseDown: drag = true; sourceButton = (DATabButton) event.widget; - sourceButtonIndex = getButtons().indexOf(sourceButton); - + sourceButtonIndex = buttons.indexOf(sourceButton); + break; case SWT.MouseUp: drag = false; - if(curPosition.y < tabComposite.getBounds().y + if (curPosition.y < tabComposite.getBounds().y || curPosition.y > tabComposite.getBounds().height - || sourceButtonIndex == getButtons().size()) { + || sourceButtonIndex == buttons.size()) { return; } - - // find the tab button index the mouse pointer is dragged and dropped - // sourceButton : the tab button you want to move - // targetButton : the tab button of position that has moved the sourceButton - if(curPosition.x <=0){ + + // find the tab button index the mouse pointer is dragged + // and dropped + // sourceButton : the tab button you want to move + // targetButton : the tab button of position that has moved + // the sourceButton + if (curPosition.x <= 0) { targetButtonIndex = 0; - }else if(curPosition.x > tabWidth * getButtons().size()){ - targetButtonIndex = getButtons().size() - 1; - }else{ + } else if (curPosition.x > tabWidth * buttons.size()) { + targetButtonIndex = buttons.size() - 1; + } else { targetButtonIndex = curPosition.x / tabWidth; } // check whether the tab button has clicked or moved if (targetButtonIndex == sourceButtonIndex) { - //click + // click changeButtonState(tabButton); } else { - //move + // move reArrangeTabs(); } - - stackLayout.topControl = tempChild; + + lasttab = contentsStackLayout.topControl; + contentsStackLayout.topControl = finalChild; tabComposite.layout(); contentsComposite.layout(); - tempChild.update(); - ((ViewAction) tempChild).updateView(); - + finalChild.update(); + finalChild.updateView(); + break; case SWT.MouseMove: - if(drag){ - DATabButton selectedBtn = (DATabButton)event.widget; - for (int i = 0; i < getButtons().size(); i++) { - Rectangle r = getButtons().get(i).getBounds(); - DATabButton btn = (DATabButton) getButtons().get(i); - + if (drag) { + DATabButton selectedBtn = (DATabButton) event.widget; + for (int i = 0; i < buttons.size(); i++) { + Rectangle r = buttons.get(i).getBounds(); + DATabButton btn = (DATabButton) buttons.get(i); + if (selectedBtn.equals(btn)) { - btn.setGradationColor(DACustomButton.STATE_DISABLE, + btn.setGradationColor( + DACustomButton.STATE_DISABLE, ColorResources.TAB_SELECTED_COLOR_START, ColorResources.TAB_SELECTED_COLOR_END); btn.setButtonEnabled(false); - stackLayout.topControl = tempChild; + lasttab = contentsStackLayout.topControl; + contentsStackLayout.topControl = finalChild; // TODO + // : + // greatim: + // is + // this + // right? tabComposite.layout(); contentsComposite.layout(); } else { - if (r.contains(curPosition.x, 0) - && (event.y > r.y && event.y < r.y+ r.height)) { - btn.changeButtonState(btn.STATE_HOVER); + if (r.contains(curPosition.x, 0) + && (event.y > r.y && event.y < r.y + + r.height)) { + btn.changeButtonState(DACustomButton.STATE_HOVER); } else { - btn.changeButtonState(btn.STATE_NORMAL); + btn.changeButtonState(DACustomButton.STATE_NORMAL); } } } @@ -262,15 +287,14 @@ public class DATabComposite extends DAView { tabButton.addListener(SWT.MouseUp, tabMoveEvent); tabButton.addListener(SWT.MouseDown, tabMoveEvent); tabButton.addListener(SWT.MouseMove, tabMoveEvent); - - childrenMap.put(ID, child); - buttonMap.put(ID, tabButton); - getButtons().add(tabButton); // TODO : think about button map?? - getTabChildren().add(child); + + buttons.add(tabButton); + children.add(child); // default focus set - if (getTabChildren().size() == 1) { - stackLayout.topControl = child; + if (children.size() == 1) { + lasttab = contentsStackLayout.topControl; + contentsStackLayout.topControl = child; contentsComposite.layout(); tabButton.setGradationColor(DACustomButton.STATE_DISABLE, ColorResources.TAB_SELECTED_COLOR_START, @@ -288,20 +312,23 @@ public class DATabComposite extends DAView { return tabButton; } - // positioning of the tab button - private void setLayoutTabs(int leftTabIndex, int tabIndex) { - FormData data = new FormData(); - data.top = new FormAttachment(0, 0); - data.bottom = new FormAttachment(100, 0); - data.width = tabWidth; - if(leftTabIndex != -1){ - data.left = new FormAttachment(getButtons().get(leftTabIndex)); - }else{ - data.left = new FormAttachment(0, 0); + private void changeButtonState(DATabButton button) { + int size = buttons.size(); + if (size > 1) { + for (int i = 0; i < size; i++) { + DATabButton sample = buttons.get(i); + if (sample.equals(button)) { + button.setGradationColor(DACustomButton.STATE_DISABLE, + ColorResources.TAB_SELECTED_COLOR_START, + ColorResources.TAB_SELECTED_COLOR_END); + button.setButtonEnabled(false); + } else { + sample.setButtonEnabled(true); + } + } } - getButtons().get(tabIndex).setLayoutData(data); - } - + } + private void reArrangeTabs() { if (sourceButtonIndex < targetButtonIndex) { // move forward // source @@ -314,53 +341,53 @@ public class DATabComposite extends DAView { setLayoutTabs((sourceButtonIndex - 1), (sourceButtonIndex + 1)); } // target+1 - if (targetButtonIndex != getButtons().size()-1) { + if (targetButtonIndex != buttons.size() - 1) { setLayoutTabs(sourceButtonIndex, (targetButtonIndex + 1)); } - Collections.rotate(getButtons().subList(sourceButtonIndex, targetButtonIndex + 1), -1); - Collections.rotate(getTabChildren().subList(sourceButtonIndex, targetButtonIndex + 1), -1); + Collections.rotate( + buttons.subList(sourceButtonIndex, targetButtonIndex + 1), + -1); + Collections.rotate( + children.subList(sourceButtonIndex, targetButtonIndex + 1), + -1); } else { // move backward // source if (targetButtonIndex == 0) { // target == first tab - setLayoutTabs(-1, sourceButtonIndex); + setLayoutTabs(-1, sourceButtonIndex); } else { setLayoutTabs((targetButtonIndex - 1), sourceButtonIndex); } - if (sourceButtonIndex != getButtons().size() - 1) { - // source+1 - setLayoutTabs((sourceButtonIndex - 1), (sourceButtonIndex + 1)); - } - // target - setLayoutTabs(sourceButtonIndex, targetButtonIndex); - Collections.rotate(getButtons().subList(targetButtonIndex, sourceButtonIndex + 1), 1); - Collections.rotate(getTabChildren().subList(targetButtonIndex, sourceButtonIndex + 1), 1); + if (sourceButtonIndex != buttons.size() - 1) { + // source+1 + setLayoutTabs((sourceButtonIndex - 1), (sourceButtonIndex + 1)); + } + // target + setLayoutTabs(sourceButtonIndex, targetButtonIndex); + Collections.rotate( + buttons.subList(targetButtonIndex, sourceButtonIndex + 1), + 1); + Collections.rotate( + children.subList(targetButtonIndex, sourceButtonIndex + 1), + 1); } } - - public void removeView(final String ID, boolean usingAnimation) { - Composite child = childrenMap.get(ID); - getTabChildren().remove(child); - childrenMap.remove(ID); - tabComposite.layout(); - - final DACustomButton button = buttonMap.get(ID); - if (!usingAnimation) { - button.setLayoutData(null); - getButtons().remove(button); - buttonMap.remove(ID); + + // positioning of the tab button + private void setLayoutTabs(int leftTabIndex, int tabIndex) { + FormData data = new FormData(); + data.top = new FormAttachment(0, 0); + data.bottom = new FormAttachment(100, 0); + data.width = tabWidth; + if (leftTabIndex != -1) { + data.left = new FormAttachment(buttons.get(leftTabIndex)); } else { - getButtons().remove(button); - buttonMap.remove(ID); - button.setGradationColor(DAButton.STATE_DISABLE, - ColorResources.TAB_NORMAL_COLOR_START, - ColorResources.TAB_NORMAL_COLOR_END); - button.setButtonEnabled(false); - tabAnimation(button, false); + data.left = new FormAttachment(0, 0); } + buttons.get(tabIndex).setLayoutData(data); } - private void tabAnimation(final DACustomButton button, final boolean isShow) { - showState = isShow; + // animate for tab appearance and disappearance + private void tabAnimation(final DATabButton button, final boolean isShow) { Timer timer = new Timer(); timer.schedule(new TimerTask() { @Override @@ -369,12 +396,14 @@ public class DATabComposite extends DAView { @Override public void run() { if (null != button && !button.isDisposed()) { + button.setAnimating(true); FormData data = (FormData) button.getLayoutData(); - if (showState == isShow && isShow) { + if (isShow) { data.width += (tabWidth / 10); if (data.width > tabWidth) { data.width = tabWidth; tabComposite.layout(); + button.setAnimating(false); cancel(); } else { tabComposite.layout(); @@ -382,13 +411,13 @@ public class DATabComposite extends DAView { } else { data.width -= (tabWidth / 10); tabComposite.layout(); - stackLayout.topControl = childrenMap.get(TimelinePage.ID); - contentsComposite.layout(); if (data.width <= 0) { + button.setAnimating(false); cancel(); } } } else { + button.setAnimating(false); cancel(); } } @@ -397,114 +426,120 @@ public class DATabComposite extends DAView { }, 10, 50); } - private void changeButtonState(DACustomButton button) { - int size = getButtons().size(); - if (size > 1) { - for (int i = 0; i < size; i++) { - DACustomButton sample = getButtons().get(i); - if (sample.equals(button)) { - button.setGradationColor(DACustomButton.STATE_DISABLE, - ColorResources.TAB_SELECTED_COLOR_START, - ColorResources.TAB_SELECTED_COLOR_END); - button.setButtonEnabled(false); - } else { - sample.setButtonEnabled(true); - } - } - } - } - - private synchronized List getTabChildren() { - if (null == children) { - children = new ArrayList(); + public void removeView(final String ID, boolean usingAnimation) { + DABaseComposite child = getView(ID); + int index = children.indexOf(child); + children.remove(index); + tabComposite.layout(); + + final DATabButton button = buttons.remove(index); + if (!usingAnimation) { + button.setLayoutData(null); + } else { + button.setGradationColor(DAButton.STATE_DISABLE, + ColorResources.TAB_NORMAL_COLOR_START, + ColorResources.TAB_NORMAL_COLOR_END); + button.setButtonEnabled(false); + tabAnimation(button, false); } - return children; - } - private List getButtons() { - if (null == buttons) { - buttons = new ArrayList(); + if (child == contentsStackLayout.topControl) { + contentsStackLayout.topControl = lasttab; + contentsComposite.layout(); } - return buttons; } public Composite getContentComposite() { return contentsComposite; } - public void setSelectTab(String ID) { - Composite tab = childrenMap.get(ID); - DACustomButton button = buttonMap.get(ID); + public void selectTab(String ID) { + DABaseComposite tab = getView(ID); + int index = children.indexOf(tab); + DATabButton button = buttons.get(index); if (null == tab || null == button) { System.out.println("tab create bug!!"); // for log //$NON-NLS-1$ return; } changeButtonState(button); - stackLayout.topControl = tab; - ((ViewAction) tab).updateView(); + lasttab = contentsStackLayout.topControl; + contentsStackLayout.topControl = tab; + tab.updateView(); contentsComposite.layout(); } @Override - public void updateView() { - ((ViewAction) stackLayout.topControl).updateView(); - } - - @Override - public void updateLog(LogPackage logPack) { - int size = getTabChildren().size(); + public void clear() { + int size = children.size(); for (int i = 0; i < size; i++) { - ((ViewAction) getTabChildren().get(i)).updateLog(logPack); + children.get(i).clear(); } } @Override - public void clear() { - int size = getTabChildren().size(); - for (int i = 0; i < size; i++) { - ((ViewAction) getTabChildren().get(i)).clear(); + public void updateView() { + if (isToplevel) { + getTopComposite().updateView(); + } else { + int size = children.size(); + for (int i = 0; i < size; i++) { + children.get(i).updateView(); + } } } @Override - public void updateView(DASelectionData data) { - ((ViewAction) getTopComposite()).updateView(data); + public void updateView(DAViewData data) { + if (isToplevel) { + getTopComposite().updateView(data); + } else { + int size = children.size(); + String viewid = data.getViewID(); + for (int i = 0; i < size; i++) { + if (!children.get(i).getID().equals(viewid)) + children.get(i).updateView(data); + } + } } - public Composite getTopComposite() { - return (Composite) stackLayout.topControl; + public DABaseComposite getTopComposite() { + return (DABaseComposite) contentsStackLayout.topControl; } public void setTabWidth(int size) { tabWidth = size; } - private PaintListener tabCompositePaintListener = new PaintListener() { + @Override + public DABaseComposite getView(String ID) { + DABaseComposite ret = null; + int size = children.size(); + for (int i = 0; i < size; i++) { + DABaseComposite child = children.get(i); + if (child.getID().equals(ID)) { + ret = child; + break; + } + } - @Override - public void paintControl(PaintEvent e) { - Composite comp = (Composite) e.widget; - Rectangle rect = comp.getClientArea(); - e.gc.setForeground(ColorResources.TAB_BG_COLOR_START); - e.gc.setBackground(ColorResources.TAB_BG_COLOR_END); - e.gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height, - true); - e.gc.setForeground(ColorResources.TAB_BG_OUTLINE_COLOR); - e.gc.drawRectangle(rect); + if (ret == null) { + for (int i = 0; i < size; i++) { + DABaseComposite child = children.get(i); + if (child.isContainer()) { + ret = child.getView(ID); + if (ret != null) + break; + } + } } - }; - public Composite getTab(String ID) { - return childrenMap.get(ID); + return ret; } @Override - public void setSelection(LogData data) { - int size = getTabChildren().size(); - for (int i = 0; i < size; i++) { - ((ViewAction) getTabChildren().get(i)).setSelection(data); - } + protected boolean isContainer() { + return true; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java old mode 100644 new mode 100755 similarity index 66% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java rename to org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java index f1263e4..0a86769 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ViewContainer.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java @@ -1,32 +1,7 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.ui.widgets; +package org.tizen.dynamicanalyzer.widgets.da.view; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.graphics.Color; @@ -38,28 +13,33 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.appearance.DesignConstants; -import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -public class ViewContainer { +/* view composite can have title bar and contents area. + * if user do double click on title bar than view composite will be maximized to whole page. + */ + +// abstract view class cannot have ID - private Canvas titleBar; - private Composite contentArea; - private String title = CommonConstants.EMPTY; - private Color titleFontColor = ColorResources.VIEW_TITLE_FONT_COLOR; +public abstract class DAViewComposite extends DABaseComposite { private static final int OFFSET = 5; - private Composite parent = null; + + // ui components + private Canvas titleBar = null; + private Composite contentArea = null; + private Color titleFontColor = ColorResources.VIEW_TITLE_FONT_COLOR; private boolean isMaximized = false; - public ViewContainer(Composite parent, boolean titleVisibility) { - final Composite composite = new Composite(parent, SWT.NONE); + public DAViewComposite(Composite parent, int style, boolean titleVisibility) { + super(parent, style); + + final Composite composite = new Composite(this, SWT.NONE); composite.setLayout(new FormLayout()); - this.parent = parent; // Creates title bar. titleBar = new Canvas(composite, SWT.DOUBLE_BUFFERED); titleBar.addPaintListener(titlePaintListener); @@ -105,16 +85,13 @@ public class ViewContainer { return contentArea; } - public void setTitleText(String title) { + @Override + public void setTitle(String title) { this.title = title; titleBar.setToolTipText(title); titleBar.redraw(); } - public String getTitleText() { - return this.title; - } - public void setTitleFontColor(Color color) { titleFontColor = color; } @@ -153,11 +130,59 @@ public class ViewContainer { @Override public void handleEvent(Event event) { - if (parent instanceof DAView) { - isMaximized = !isMaximized; - ((DAView) parent).setMaxSize(isMaximized); - } + isMaximized = !isMaximized; + setMaxSize(isMaximized); } }; + protected void setMaxSize(boolean maximized) { + Control current = this; + Composite parent = getParent(); + while (parent != null) { + if ((parent instanceof DAPageComposite) + && ((DAPageComposite) parent).isToplevel()) + break; + + if (parent instanceof SashForm) { + if (maximized) + ((SashForm) parent).setMaximizedControl(current); + else + ((SashForm) parent).setMaximizedControl(null); + } + current = parent; + parent = parent.getParent(); + } + + } + + @Override + public void updateView() { + // do nothing + } + + @Override + public void updateView(DAViewData data) { + // do nothing + } + + @Override + public void clear() { + // do nothing + } + + public Control getControl() { + // do nothing + // TODO : greatim, have to remove? + return null; + } + + @Override + protected boolean isContainer() { + return false; + } + + @Override + public DABaseComposite getView(String viewid) { + return null; + } } diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewData.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewData.java new file mode 100644 index 0000000..82820e9 --- /dev/null +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewData.java @@ -0,0 +1,27 @@ +package org.tizen.dynamicanalyzer.widgets.da.view; + +public class DAViewData { + protected String viewID = null; + protected Object data = null; + + public DAViewData(String viewid, Object data) { + this.viewID = viewid; + this.data = data; + } + + public String getViewID() { + return viewID; + } + + public void setViewID(String viewid) { + this.viewID = viewid; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TabButtonRenderer.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java similarity index 97% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TabButtonRenderer.java rename to org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java index c1e8268..a351eab 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TabButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java @@ -24,7 +24,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.widgets; +package org.tizen.dynamicanalyzer.widgets.da.view; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; @@ -61,7 +61,7 @@ public class TabButtonRenderer implements IDACustomButtonRenderer { drawButtonText(gc, rect, state, attr); if (button.isClosable()) { - Image img = button.getCloseImage(); + Image img = button.getCloseButtonImage(); Rectangle imgRect = img.getBounds(); gc.drawImage(img, rect.width - imgRect.width, rect.y + 1); } @@ -91,7 +91,7 @@ public class TabButtonRenderer implements IDACustomButtonRenderer { gc.setForeground(c); if (button.isClosable()) { - Image img = button.getCloseImage(); + Image img = button.getCloseButtonImage(); Rectangle imgRect = img.getBounds(); gc.drawImage(img, rect.width - imgRect.width - 2, rect.y + 2); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java index de38430..301e4c2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java @@ -136,7 +136,7 @@ public class AnalyzerConstants { public static final String MSG_VERSION = "999"; //$NON-NLS-1$ public static final String MSG_OK = "901"; //$NON-NLS-1$ public static final String MSG_NOT_OK = "902"; //$NON-NLS-1$ - public static final String MSG_SNAPSHOT = "103"; //$NON-NLS-1$ + public static final String MSG_SCREENSHOT = "103"; //$NON-NLS-1$ public static final int MSG_RECORD = 801; public static final int MSG_REPLAY = 802; @@ -191,8 +191,8 @@ public class AnalyzerConstants { public static final long NETWORK_API_PROBING_NO_FILTER = FEATURE_ON; // prefeature public static final long OPENGL_API_PROBING_NO_FILTER = FEATURE_ON <<1;// prefeaturen - public static final long SNAPSHOT_PERIODIC = 10;//must modification - public static final long SNAPSHOT_PERIODIC_AUTO = 1;//must modification + public static final long SCREENSHOT_PERIODIC = 10;//must modification + public static final long SCREENSHOT_PERIODIC_AUTO = 1;//must modification public static final long FUNCTION_PROFILING_SAMPLING_PERIODIC = 10;//must modification public static final long SYSTEM_INFOMATION_SAMPLING_PERIODIC = 1000;//must modification @@ -206,8 +206,8 @@ public class AnalyzerConstants { public static final int MSG_TERMINATE = 7; //$NON-NLS-1$ public static final int MSG_DEBUG = 9; //$NON-NLS-1$ - public static final int SNAPSHOT_OFF = 0; - public static final int SNAPSHOT_ON = 1; + public static final int SCREENSHOT_OFF = 0; + public static final int SCREENSHOT_ON = 1; public static final int DAEMON_LISTEN_TRY = 50; 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 12ad926..36ad442 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -45,9 +45,8 @@ import org.tizen.dynamicanalyzer.swap.callstack.BaseCallstackManager; import org.tizen.dynamicanalyzer.swap.callstack.SWAPCallStackManager; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackManager; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ScreenshotTimerTask; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotTimerTask; import org.tizen.dynamicanalyzer.ui.page.BaseView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedChecker; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDetector; @@ -59,6 +58,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDat import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.ImageListSortComparator; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class AnalyzerManager { private static Project project = null; @@ -189,12 +189,12 @@ public class AnalyzerManager { // UserFunctionManager.getInstance().clear(); LogDataFactory.clean(); FunctionUsageProfiler.clear(); - FunctionUsageProfiler.stopProfiler(); + FunctionUsageProfiler.getInstance().stopThread(); RangeDataManager.getInstance().initRange(); startBinaryAddr = -1; endBinaryAddr = -1; appInfoArrived = false; - if(funcNameMapByPid != null) + if (funcNameMapByPid != null) funcNameMapByPid.clear(); processCount = 0; } @@ -318,7 +318,7 @@ public class AnalyzerManager { if (!AnalyzerManager.isExit()) { AnalyzerUtil.executeCommand(StartHandler.ID); } - + } public static boolean isOsp() { @@ -359,11 +359,11 @@ public class AnalyzerManager { } public static HashMap getFuncNameMapByPid(int pid) { - if(funcNameMapByPid == null) { + if (funcNameMapByPid == null) { funcNameMapByPid = new HashMap>(); } HashMap funcNameMap = funcNameMapByPid.get(pid); - if(funcNameMap == null) { + if (funcNameMap == null) { funcNameMap = new HashMap(); funcNameMapByPid.put(pid, funcNameMap); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASelectionData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASelectionData.java index cd31600..8df48e9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASelectionData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DASelectionData.java @@ -27,27 +27,33 @@ package org.tizen.dynamicanalyzer.common; import org.eclipse.swt.widgets.Control; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class DASelectionData { - private String viewId; - private long startTime; - private long endTime; - private Object data; - private Control control; - - public DASelectionData() { - // TODO Auto-generated constructor stub - } +public class DASelectionData extends DAViewData { + protected long startTime; + protected long endTime; + protected Control control = null; + protected boolean isLogData = false; public DASelectionData(String id, long start, long end, Object data, Control ctrl) { - viewId = id; + super(id, data); + + isLogData = false; startTime = start; endTime = end; - this.data = data; control = ctrl; } + public DASelectionData(String id, Object data) { + super(id, data); + + isLogData = true; + startTime = 0; + endTime = 0; + control = null; + } + public Control getControl() { return control; } @@ -56,14 +62,6 @@ public class DASelectionData { this.control = control; } - public String getViewId() { - return viewId; - } - - public void setViewId(String viewId) { - this.viewId = viewId; - } - public long getStartTime() { return startTime; } @@ -80,11 +78,7 @@ public class DASelectionData { this.endTime = endTime; } - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; + public boolean isLogData() { + return isLogData; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SnapshotConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ScreenshotConstants.java similarity index 94% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SnapshotConstants.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ScreenshotConstants.java index 4a4e49a..09e6b05 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SnapshotConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/ScreenshotConstants.java @@ -26,7 +26,7 @@ package org.tizen.dynamicanalyzer.common; -public class SnapshotConstants { +public class ScreenshotConstants { public static final int DEFAULT_IMAGE_WIDTH = 270; public static final int DEFAULT_IMAGE_HEIGHT = 450; public static final int DEFAULT_IMAGE_MARGIN_X = 5; @@ -59,8 +59,8 @@ public class SnapshotConstants { public static final int IMAGE_MARGIN_TOP = 5; public static final int IMAGE_MARGIN_BOTTOM = 10; - public static final int SNAPSHOT_IMAGE_WIDTH = 50; - public static final int SNAPSHOT_IMAGE_HEIGHT = 70; + public static final int SCREENSHOT_IMAGE_WIDTH = 50; + public static final int SCREENSHOT_IMAGE_HEIGHT = 70; public static final int CANVAS_MARGIN_TOP = 10; public static final int CANVAS_MARGIN_BOTTOM = 10; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java index be89b6a..36f1ec1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java @@ -45,14 +45,10 @@ import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.swap.channel.control.EventObject; import org.tizen.dynamicanalyzer.swap.channel.control.ReplayEvent; -import org.tizen.dynamicanalyzer.ui.file.FileChartManager; -import org.tizen.dynamicanalyzer.ui.network.NetworkChartManager; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; -import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; -import org.tizen.dynamicanalyzer.ui.thread.ThreadChartManager; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.util.CommonUtil; @@ -103,11 +99,8 @@ public class Communicator22 extends BaseCommunicator { UIRecorderTool.getInstance().startRecorder(); ToolbarArea.getInstance().startTimer(); - FileChartManager.getInstance().startUpdateLogThread(); - NetworkChartManager.getInstance().startUpdateLogThread(); - ThreadChartManager.getInstance().startUpdateLogThread(); - UIDataManager.getInstance().startUpdateLogThread(); - FunctionUsageProfiler.startProfiler(); + // start data manager threads + DataManagerRegistry.startThreads(); /* Timeline */ UpdateViewTimer.start(); @@ -132,7 +125,7 @@ public class Communicator22 extends BaseCommunicator { HostResult result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - System.out.println("snapshot message ack :" + result.getMessage()); + System.out.println("screenshot message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -178,15 +171,11 @@ public class Communicator22 extends BaseCommunicator { if (null == DACommunicator.getSelectedApp()) { return HostResult.ERR_SELECTED_APP_IS_NULL; } - String rearMessage = CommonConstants.EMPTY - + res - + isEmul - + isArm + String rearMessage = CommonConstants.EMPTY + res + isEmul + isArm + CommonConstants.CMD_SPLIT + ConfigureManager.getInstance().getConfiguration(device) + CommonConstants.CMD_SPLIT - + DACommunicator.getSelectedApp().getInfo( - AppInfo.EXEC_INDEX); + + DACommunicator.getSelectedApp().getInfo(AppInfo.EXEC_INDEX); String message = AnalyzerConstants.MSG_START + CommonConstants.CMD_SPLIT + rearMessage.length() 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 2217b53..3dc6811 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -32,8 +32,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.path.PathManager; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class OpenTraceCompleteHandler extends AbstractHandler { public static String ID = OpenTraceCompleteHandler.class.getName(); @@ -45,7 +45,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { @Override public void run() { DAPageComposite page = AnalyzerManager.getCurrentPage(); - page.updatePage(); + page.updateView(); if (AnalyzerManager.getProject().getSavePath() .contains(PathManager.DA_TEMP_FOLDER_PATH)) { ToolbarArea.getInstance().setMainControlEnablement(true); @@ -59,7 +59,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { @Override public void run() { DAPageComposite page = AnalyzerManager.getCurrentPage(); - page.updatePage(); + page.updateView(); } }); System.out.println("open trace complete!!"); //$NON-NLS-1$ 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 028d9e3..0c7bff2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -54,7 +54,6 @@ import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.range.RangePage; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedChecker; @@ -73,6 +72,7 @@ import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class OpenTraceHandler extends AbstractHandler { @@ -93,7 +93,7 @@ public class OpenTraceHandler extends AbstractHandler { AnalyzerUtil.executeCommand(ClearHandler.ID); return null; } - project.loadSaveFormat(pInfo); + project.loadSaveFormat(pInfo); OpenTraceProgressManager.getInstance().openTracePrgressStart( AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING); @@ -164,7 +164,7 @@ public class OpenTraceHandler extends AbstractHandler { if (RangeDataManager.getInstance().isBeingAnalyzed()) { DAPageComposite page = AnalyzerManager.getCurrentPage(); if (page instanceof RangePage) { - AnalyzerUtil.changePage(TimelinePage.ID); + AnalyzerUtil.changePage(TimelinePage.pageID); } } @@ -360,8 +360,8 @@ public class OpenTraceHandler extends AbstractHandler { parent.getChildren().add(leakData); } } else { - leakDectector.getLeakHash() - .put((long)leakData.getKey(), leakData); + leakDectector.getLeakHash().put((long) leakData.getKey(), + leakData); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StartHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StartHandler.java index af1d36d..3a1d18a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StartHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StartHandler.java @@ -32,12 +32,13 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.SummaryLabels; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class StartHandler extends AbstractHandler { @@ -49,14 +50,15 @@ public class StartHandler extends AbstractHandler { @Override public void run() { DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil - .getView(TimelinePage.ID, DATabComposite.ID); - SnapshotView snapshotView = (SnapshotView) timelineTabComp - .getTab(SnapshotView.ID); - snapshotView.setLatestButtonEnable(false); + .getView(TimelinePage.pageID, + ScreenshotTabComposite.tabID); + ScreenshotView screenshotView = (ScreenshotView) timelineTabComp + .getView(ScreenshotTabComposite.screenshotViewID); + screenshotView.setLatestButtonEnable(false); LeakView leakView = (LeakView) AnalyzerUtil.getView( - SummaryPage.ID, LeakView.ID); - leakView.setViewTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK_CANDIDATE); + SummaryPage.pageID, SummaryPage.leakViewID); + leakView.setTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK_CANDIDATE); } }); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StopHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StopHandler.java index 285cd45..3bf5a9f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StopHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StopHandler.java @@ -31,12 +31,13 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.nl.SummaryLabels; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class StopHandler extends AbstractHandler { @@ -48,14 +49,14 @@ public class StopHandler extends AbstractHandler { @Override public void run() { DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil - .getView(TimelinePage.ID, DATabComposite.ID); - SnapshotView snapshotView = (SnapshotView) timelineTabComp - .getTab(SnapshotView.ID); - snapshotView.setLatestButtonEnable(false); + .getView(TimelinePage.pageID, ScreenshotTabComposite.tabID); + ScreenshotView screenshotView = (ScreenshotView) timelineTabComp + .getView(ScreenshotTabComposite.screenshotViewID); + screenshotView.setLatestButtonEnable(false); LeakView leakView = (LeakView) AnalyzerUtil.getView( - SummaryPage.ID, LeakView.ID); - leakView.setViewTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK); + SummaryPage.pageID, SummaryPage.leakViewID); + leakView.setTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK); } }); return null; 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 83f2ef8..c830981 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/SummaryMouseDoubleClickListener.java @@ -31,6 +31,7 @@ import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.graphics.Point; +import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.swap.model.data.FileData; import org.tizen.dynamicanalyzer.swap.model.data.GLES20LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; @@ -40,18 +41,23 @@ 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.ui.GLPage; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; 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; public class SummaryMouseDoubleClickListener implements MouseListener { boolean doubleClicked = false; LogData data = null; String pageId = null; + String sourceViewID = null; + + public SummaryMouseDoubleClickListener(String sourceview) { + sourceViewID = sourceview; + } @Override public void mouseUp(MouseEvent e) { @@ -61,7 +67,7 @@ public class SummaryMouseDoubleClickListener implements MouseListener { AnalyzerUtil.changePage(pageId); DAPageComposite page = (DAPageComposite) AnalyzerUtil .getTabPage(pageId); - page.setSelection(data); + page.updateView(new DASelectionData(sourceViewID, data)); } } } @@ -73,7 +79,7 @@ public class SummaryMouseDoubleClickListener implements MouseListener { @Override public void mouseDoubleClick(MouseEvent e) { // swt.button1 = left click - // swt.button3 = rightn click + // swt.button3 = right click if (ToolbarArea.getInstance().isSourceViewEnabled() || !(e.widget instanceof Grid)) { return; @@ -90,19 +96,19 @@ public class SummaryMouseDoubleClickListener implements MouseListener { // data.get(LogCenterConstants.RESOURCE_FDTYPE_INDEX); // int type = Integer.parseInt(fdType); // if (type == LogCenterConstants.FD_TYPE_FILE) { - pageId = FilePage.ID; + pageId = FilePage.pageID; // } // else { // pageId = NetworkPage.ID; // } } else if (data instanceof ThreadData) { - pageId = ThreadPage.ID; + pageId = ThreadPage.pageID; } else if (data instanceof UIEventData) { - pageId = UIPage.ID; + pageId = UIPage.pageID; } else if (data instanceof NetworkData) { - pageId = NetworkPage.ID; + pageId = NetworkPage.pageID; } else if (data instanceof GLES20LogData) { - pageId = GLPage.ID; + pageId = GLPage.pageID; } else { return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java index 4157a80..cd5528e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogCenterConstants.java @@ -151,8 +151,8 @@ public class LogCenterConstants { public static final int HTTP_API_CLOSE = 23; /* Log snapshot */ - public static final int SNAPSHOT_IMAGE_PATH_INDEX = 12; - public static final int SNAPSHOT_ROTATE_INDEX = 13; + public static final int SCREENSHOT_IMAGE_PATH_INDEX = 12; + public static final int SCREENSHOT_ROTATE_INDEX = 13; /* Log UserInterface Scene Transforms : 8 */ public static final int USER_INTERFACE_SCENE_TRANSFORMS_LIST_SCENE_NAME_INDEX = 12; 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 15b0821..bc90d25 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java @@ -519,9 +519,9 @@ public class LogParser implements Runnable { result = front; break; case DataChannelConstants.MSG_PROBE_SCREENSHOT: - String imgFilePath = input[LogCenterConstants.SNAPSHOT_IMAGE_PATH_INDEX]; + String imgFilePath = input[LogCenterConstants.SCREENSHOT_IMAGE_PATH_INDEX]; int orientation = Integer - .parseInt(input[LogCenterConstants.SNAPSHOT_ROTATE_INDEX]); + .parseInt(input[LogCenterConstants.SCREENSHOT_ROTATE_INDEX]); rear = ByteUtils.getByte(imgFilePath, orientation); result = ByteUtils.concatByteArray(front, rear); break; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DAView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DAView.java deleted file mode 100644 index 25a19b8..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DAView.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.model; - -import org.eclipse.swt.custom.SashForm; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.ui.page.ViewAction; - -public class DAView extends Composite implements ViewAction { - //name is using on tab - protected String name = null; - protected int[] oldInnerLayout = null; - protected int[] oldOuterLayout = null; - - private int[] innerMaxWeight = null; - private int[] outerMaxWeight = null; - - public DAView(Composite parent, int style) { - super(parent, style); - } - - @Override - public void updateView() { - // TODO Auto-generated method stub - - } - - @Override - public void updateLog(LogPackage logPack) { - // TODO Auto-generated method stub - - } - - @Override - public void clear() { - // TODO Auto-generated method stub - - } - - @Override - public Control getControl() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void updateView(DASelectionData data) { - // TODO Auto-generated method stub - - } - - @Override - public void otherViewSelectionOccured() { - // TODO Auto-generated method stub - - } - - @Override - public String getViewName() { - return name; - } - - public void setMaxSize(boolean maximized) { - - if (null == innerMaxWeight || null == outerMaxWeight) { - return; - } - - Composite parent = getParent(); - if (!(parent instanceof SashForm)) { - parent = parent.getParent(); - if (!(parent instanceof SashForm)) { - return; - } - } - - Composite pParent = parent.getParent(); - if (!(pParent instanceof SashForm)) { - return; - } - - SashForm innerForm = (SashForm) parent; - SashForm outerForm = (SashForm) pParent; - - if (maximized) { - oldInnerLayout = innerForm.getWeights(); - oldOuterLayout = outerForm.getWeights(); - innerForm.setWeights(innerMaxWeight); - outerForm.setWeights(outerMaxWeight); - } else { - innerForm.setWeights(oldInnerLayout); - outerForm.setWeights(oldOuterLayout); - } - } - - public void setMaxWeight(int[] inner, int[] outer) { - innerMaxWeight = inner; - outerMaxWeight = outer; - } - - @Override - public void setSelection(LogData data) { - // TODO Auto-generated method stub - - } - -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java index 6bce325..0e0692b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/DeviceInfo.java @@ -40,7 +40,7 @@ import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.project.PackageInfo; import org.tizen.dynamicanalyzer.swap.channel.control.TargetInfo; import org.tizen.dynamicanalyzer.swap.communicator.Communicator30; -import org.tizen.dynamicanalyzer.ui.info.snapshot.EmulatorSnapshot; +import org.tizen.dynamicanalyzer.ui.info.screenshot.EmulatorScreenshot; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.sdblib.IDevice; @@ -63,7 +63,7 @@ public class DeviceInfo { private Socket controlSock = null; private Socket dataSock = null; - public EmulatorSnapshot emulatorSnapshot = null; + public EmulatorScreenshot emulatorScreenshot = null; public DeviceInfo(IDevice device) { this.device = device; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java index e0d2043..ac7c983 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java @@ -101,31 +101,31 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { // ctrl + number 1 ~ 6 page else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_1) { System.out.println("timeline page"); - AnalyzerUtil.changePage(TimelinePage.ID); + AnalyzerUtil.changePage(TimelinePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_4) { System.out.println("file page"); - AnalyzerUtil.changePage(FilePage.ID); + AnalyzerUtil.changePage(FilePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_3) { System.out.println("NetworkPage page"); - AnalyzerUtil.changePage(NetworkPage.ID); + AnalyzerUtil.changePage(NetworkPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_2) { System.out.println("thread page"); - AnalyzerUtil.changePage(ThreadPage.ID); + AnalyzerUtil.changePage(ThreadPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { System.out.println("ui page"); - AnalyzerUtil.changePage(UIPage.ID); + AnalyzerUtil.changePage(UIPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_5) { System.out.println("Graphics page"); - AnalyzerUtil.changePage(GLPage.ID); + AnalyzerUtil.changePage(GLPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_7) { System.out.println("Kernel page"); - AnalyzerUtil.changePage(KernelPage.ID); + AnalyzerUtil.changePage(KernelPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_8) { System.out.println("summary page"); - AnalyzerUtil.changePage(SummaryPage.ID); + AnalyzerUtil.changePage(SummaryPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_9) { System.out.println("range page"); - AnalyzerUtil.changePage(RangePage.ID); + AnalyzerUtil.changePage(RangePage.pageID); } // ctrl + t = 116 // 103 -> g 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 0ba89fa..37c680c 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -1422,7 +1422,7 @@ public class SqlManager { return dbInfo.get(0); } - public long getLastSnapshotTime(long time) { + public long getLastScreenshotTime(long time) { String queryOption = "where time >=" + time;//$NON-NLS-1$ List> dbInfo = selectQuery(null, new String[] { "min(time)" }, "screenshot", queryOption); //$NON-NLS-1$ //$NON-NLS-2$ 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 9686a6c..170083b 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 @@ -43,7 +43,6 @@ import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.swap.channel.control.BinaryInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; -import org.tizen.dynamicanalyzer.swap.logparser.SWAPLogParser; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; 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 d80a956..b728b25 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 @@ -76,24 +76,19 @@ import org.tizen.dynamicanalyzer.swap.channel.control.FunctionInst; import org.tizen.dynamicanalyzer.swap.channel.control.RunTimeConfiguration; import org.tizen.dynamicanalyzer.swap.channel.control.TargetInfo; import org.tizen.dynamicanalyzer.swap.channel.control.UserSpaceInst; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.swap.logparser.SWAPLogParser; import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.data.LogDataUtils; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; -import org.tizen.dynamicanalyzer.ui.file.FileChartManager; -import org.tizen.dynamicanalyzer.ui.info.snapshot.EmulatorSnapshot; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SocketClient; -import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataManager; -import org.tizen.dynamicanalyzer.ui.network.NetworkChartManager; +import org.tizen.dynamicanalyzer.ui.info.screenshot.EmulatorScreenshot; +import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; -import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; -import org.tizen.dynamicanalyzer.ui.thread.ThreadChartManager; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.StartProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; @@ -114,7 +109,7 @@ public class Communicator30 extends BaseCommunicator { if (!SocketClient.getInstance().connect()) { System.out.println("[warn] Connect to ecs server is failed"); } - devInfo.emulatorSnapshot = new EmulatorSnapshot(); + devInfo.emulatorScreenshot = new EmulatorScreenshot(); } // daemon start @@ -249,12 +244,8 @@ public class Communicator30 extends BaseCommunicator { UIRecorderTool.getInstance().startRecorder(); ToolbarArea.getInstance().startTimer(); SWAPLogParser.startLogParser(); - KernelDataManager.getInstance().startUpdateLogThread(); - FileChartManager.getInstance().startUpdateLogThread(); - NetworkChartManager.getInstance().startUpdateLogThread(); - ThreadChartManager.getInstance().startUpdateLogThread(); - UIDataManager.getInstance().startUpdateLogThread(); - FunctionUsageProfiler.startProfiler(); + // start registered data manager thread + DataManagerRegistry.startThreads(); /* Timeline */ UpdateViewTimer.start(); @@ -473,13 +464,10 @@ public class Communicator30 extends BaseCommunicator { try { DACommunicator.getSelectedDevice().getIDevice().setRootUser(true); } catch (TimeoutException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (SdbCommandRejectedException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/DataManagerRegistry.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/DataManagerRegistry.java new file mode 100644 index 0000000..bd143a0 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/DataManagerRegistry.java @@ -0,0 +1,54 @@ +package org.tizen.dynamicanalyzer.swap.logparser; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +public class DataManagerRegistry { + + private static HashMap dataManagers = null; + + public static synchronized void registerPageDataManager(PageDataManager mgr) { + if (dataManagers == null) { + dataManagers = new HashMap(); + } + + if (!dataManagers.containsKey(mgr.getName())) { + dataManagers.put(mgr.getName(), mgr); + } + } + + public static Set> getEntrySet() { + return dataManagers.entrySet(); + } + + public static void startThreads() { + for (Map.Entry entry : dataManagers.entrySet()) { + entry.getValue().startThread(); + } + } + + public static void stopThreads() { + for (Map.Entry entry : dataManagers.entrySet()) { + entry.getValue().stopThread(); + } + } + + public static boolean isAnyoneAlive() { + boolean ret = false; + for (Map.Entry entry : dataManagers.entrySet()) { + ret = entry.getValue().isThreadAlive(); + if (ret) + break; + } + + return ret; + } + + public static void updateLog(LogPackage pack) { + for (Map.Entry entry : dataManagers.entrySet()) { + entry.getValue().updateLog(pack); + } + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java new file mode 100644 index 0000000..aeb2064 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java @@ -0,0 +1,55 @@ +package org.tizen.dynamicanalyzer.swap.logparser; + +import org.tizen.dynamicanalyzer.common.AnalyzerManager; + +public abstract class PageDataManager implements Runnable { + private String name = null; + private Thread thread = null; + private ReadBlockingQueue logPackQueue = new ReadBlockingQueue(); + + public final String getName() { + if (name == null) { + name = getClass().getName(); + } + return name; + } + + public final void updateLog(LogPackage logPack) { + logPackQueue.offer(logPack); + } + + protected final LogPackage pollPack() { + return logPackQueue.poll(); + } + + public final void startThread() { + if (thread == null || !thread.isAlive()) { + thread = new Thread(null, this, getName()); + thread.start(); + } + } + + public final void stopThread() { + if (thread != null && thread.isAlive()) { + try { + sendNotify(); + thread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); + thread = null; + System.out.println(getName() + " thread joined!"); //$NON-NLS-1$ + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + + public final boolean isThreadAlive() { + if (null == thread || !thread.isAlive()) { + return false; + } + return true; + } + + protected void sendNotify() { + logPackQueue.wake(); + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/ReadBlockingQueue.java similarity index 82% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/ReadBlockingQueue.java index 085249a..aacf3e6 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/ReadBlockingQueue.java @@ -24,24 +24,23 @@ * */ -package org.tizen.dynamicanalyzer.ui.kernel.data; +package org.tizen.dynamicanalyzer.swap.logparser; import java.util.concurrent.ConcurrentLinkedQueue; -public class KernelBlockingQueue { +public class ReadBlockingQueue { private ConcurrentLinkedQueue dataQueue; - public KernelBlockingQueue() { + public ReadBlockingQueue() { dataQueue = new ConcurrentLinkedQueue(); } public synchronized E poll() { - while (dataQueue.isEmpty()) { + if (dataQueue.isEmpty()) { try { wait(); } catch (InterruptedException e) { e.printStackTrace(); - break; } } @@ -54,4 +53,8 @@ public class KernelBlockingQueue { dataQueue.offer(data); notifyAll(); } + + public synchronized void wake() { + notifyAll(); + } } 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 d87b9e1..859fa1c 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 @@ -52,11 +52,9 @@ import org.tizen.dynamicanalyzer.swap.model.data.ReplayData; import org.tizen.dynamicanalyzer.swap.model.data.ScreenShotData; import org.tizen.dynamicanalyzer.swap.model.data.SystemData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SocketClient; -import org.tizen.dynamicanalyzer.ui.page.BaseView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.ImageUtil; import org.tizen.dynamicanalyzer.utils.ImageUtilSWT; import org.tizen.sdblib.service.SyncResult; @@ -66,7 +64,7 @@ public class SWAPLogParser implements Runnable { private static Thread logParser = null; // default false, turn on when Tizen C++ app // private static boolean dropCallTraceLog = true; -// private static boolean dropCallTraceLog = false; + // private static boolean dropCallTraceLog = false; private static LogQueue logQueue = null; private int SMALL_IMG_WIDTH = 40; @@ -106,6 +104,8 @@ public class SWAPLogParser implements Runnable { e.printStackTrace(); } } + + DataManagerRegistry.stopThreads(); } /*** log parsing thread ***/ @@ -141,7 +141,8 @@ public class SWAPLogParser implements Runnable { int id = log.getId(); int seqNum = log.getSeq(); if (log instanceof SystemData) { - System.out.println("=========systemData is slicing===========\n"); + System.out + .println("=========systemData is slicing===========\n"); pushLog(log, logPack); } else if (log instanceof ProfileData) { if (!AnalyzerManager.isProcessInfoArrived()) { @@ -154,7 +155,7 @@ public class SWAPLogParser implements Runnable { ProcessInfoPackage processInfoPkg = AnalyzerManager .getProject().getProcessInfo(pData.getPid()); - + String apiName = pData.getApiName(); if (null == apiName || apiName.isEmpty() || apiName.equals("_end")) { //$NON-NLS-1$ @@ -177,10 +178,10 @@ public class SWAPLogParser implements Runnable { } // irregular call check still necessary? -// if (AnalyzerManager.getCallstackManager() -// .isIrregularUserCall(pData)) { -// continue; -// } + // if (AnalyzerManager.getCallstackManager() + // .isIrregularUserCall(pData)) { + // continue; + // } ProcessInfo processInfo = processInfoPkg .getProcessInfo(pData.getTime()); @@ -231,9 +232,9 @@ public class SWAPLogParser implements Runnable { String remoteImgPath; if (DACommunicator.isTargetEmulator() && SocketClient.getInstance().isConnected()) { - DACommunicator.getSelectedDevice().emulatorSnapshot + DACommunicator.getSelectedDevice().emulatorScreenshot .send(); - remoteImgPath = DACommunicator.getSelectedDevice().emulatorSnapshot + remoteImgPath = DACommunicator.getSelectedDevice().emulatorScreenshot .getFilePath(); bECS = true; } else { @@ -395,8 +396,7 @@ public class SWAPLogParser implements Runnable { LogInserter.getInsertLogQueue().push(logPack); LogInserter.startInsertLogThread(); - BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - bv.getMainTab().updateLog(logPack); + DataManagerRegistry.updateLog(logPack); // System.out.println("view update!!"); } @@ -439,21 +439,21 @@ public class SWAPLogParser implements Runnable { /** for debug */ BinaryInfo binInfo1 = processInfo.getTargetBinary(input.getPcAddr()); if (binInfo1 == null) { -// System.out.println("[Get functino name bug : " -// + "Can't find binary info]"); -// System.out -// .println("msg id : " -// + AnalyzerUtil.toHexdecimal(input.getId()) -// + " pid : " -// + processInfo.getPid() -// + " low : " -// + AnalyzerUtil.toHexdecimal(processInfo -// .getLowestAddress()) -// + " input addr : " -// + AnalyzerUtil.toHexdecimal(input.getPcAddr()) -// + " high : " -// + AnalyzerUtil.toHexdecimal(processInfo -// .getHighestAddress())); + // System.out.println("[Get functino name bug : " + // + "Can't find binary info]"); + // System.out + // .println("msg id : " + // + AnalyzerUtil.toHexdecimal(input.getId()) + // + " pid : " + // + processInfo.getPid() + // + " low : " + // + AnalyzerUtil.toHexdecimal(processInfo + // .getLowestAddress()) + // + " input addr : " + // + AnalyzerUtil.toHexdecimal(input.getPcAddr()) + // + " high : " + // + AnalyzerUtil.toHexdecimal(processInfo + // .getHighestAddress())); return null; } // String binPath1 = binInfo1.getTargetBinaryPath(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java index 2d13631..c974ad7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java @@ -10,14 +10,13 @@ import org.eclipse.swt.events.MouseMoveListener; import org.eclipse.swt.widgets.Canvas; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -29,6 +28,7 @@ import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; import org.tizen.dynamicanalyzer.widgets.chart.DAScreenshotChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAUIEventChartPlot; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; @@ -73,8 +73,8 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements return; } - if (eventTime * TimelineConstants.MEGA_DOUBLE <= ToolbarArea.getInstance() - .getTime()) { + if (eventTime * TimelineConstants.MEGA_DOUBLE <= ToolbarArea + .getInstance().getTime()) { startItem.setEnabled(true); endItem.setEnabled(true); analysisItem.setEnabled(rangeDataManager.isAnalyzable()); @@ -122,13 +122,13 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements return; } - - DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil - .getView(TimelinePage.ID, DATabComposite.ID); - SnapshotView snapshotView = (SnapshotView) timelineTabComp - .getTab(SnapshotView.ID); - snapshotView.setLatestButtonEnable(true); - + + DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil.getView( + TimelinePage.pageID, ScreenshotTabComposite.tabID); + ScreenshotView screenshotView = (ScreenshotView) timelineTabComp + .getView(ScreenshotTabComposite.screenshotViewID); + screenshotView.setLatestButtonEnable(true); + boolean bShift = false; if ((e.stateMask & SWT.SHIFT) != 0) { bShift = true; @@ -136,7 +136,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements if (plot instanceof DAScreenshotChartPlot) { DAChartSeries series = chart.getSeries(0); - if(series != null) { + if (series != null) { int index = series.getPrevIndexByXvalue(eventTime); if (index >= 0 && index < series.getSeriesItemList().size()) { DAChartSeriesItem item = series.getSeriesItemList().get( @@ -378,9 +378,9 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements if (startTime < 0) { startTime = 0; } - AnalyzerManager.getCurrentPage().updatePage( - new DASelectionData(TimelineView.ID, startTime, endTime, null, - null)); + AnalyzerManager.getCurrentPage().updateView( + new DASelectionData(TimelinePage.timelineViewID, startTime, + endTime, null, null)); } private int getHighlightedImageIndex(DAChartPlot plot, 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 3ed6bc0..006829a 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,18 +42,13 @@ import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.FileData; -import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; 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.widgets.chart.DAChartPlotIntervalMarker; -import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; public class FileApiListTable extends DAApiListTableComposite { - private DAChartBoard chartBoard = null; - public FileApiListTable(Composite parent, int compStyle, int tableStyle) { super(parent, compStyle, tableStyle); table.addSelectionListener(new SelectionListener() { @@ -85,15 +80,13 @@ public class FileApiListTable extends DAApiListTableComposite { } DASelectionData selData = new DASelectionData( - FileApiListView.ID, startTime, endTime, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - FileApiListView.ID); + FilePage.apilistViewID, startTime, endTime, items, + table); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub } }); } @@ -101,7 +94,7 @@ public class FileApiListTable extends DAApiListTableComposite { @Override protected List makeTableInput() { FileApiListView view = (FileApiListView) AnalyzerManager - .getCurrentPage().getViewMap().get(FileApiListView.ID); + .getCurrentPage().getView(FilePage.apilistViewID); FileChartData data = view.getPageData(); if (null == data) { @@ -234,14 +227,6 @@ public class FileApiListTable extends DAApiListTableComposite { return input; } - private DAChartBoard getChartBoard() { - if (chartBoard == null) { - chartBoard = (DAChartBoard) (AnalyzerManager.getCurrentPage() - .getView(FileChartView.ID).getControl()); - } - return chartBoard; - } - protected void actionSetStartEnd(int type) { GridItem item = table.getItem(mousePoint); if (null != item) { @@ -250,7 +235,6 @@ public class FileApiListTable extends DAApiListTableComposite { long time = data.getTime(); double startTime = -1; double endTime = -1; - DAChartBoard board = getChartBoard(); if (type == START_TIME) { rangeDataManager.setMarkerStartTime(time); @@ -265,12 +249,10 @@ public class FileApiListTable extends DAApiListTableComposite { / TimelineConstants.MEGA_DOUBLE; } - board.setTimelineMarkerStartTime(startTime); - board.setTimelineMarkerEndTime(endTime); + FileChartView chartview = (FileChartView) (AnalyzerManager + .getCurrentPage().getView(FilePage.chartViewID)); - ((DAChartPlotIntervalMarker) board.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - startTime, endTime); + chartview.setRangeMarker(startTime, endTime); } } } 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 063d527..cc104cf 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 @@ -35,25 +35,21 @@ import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class FileApiListView extends DAView { - - public static final String ID = FileApiListView.class.getName(); +public class FileApiListView extends DAViewComposite { private FileChartData data; private long analysisStartTime = 0; private long analysisEndTime = 0; private long selectionStartTime = 0; private long selectionEndTime = 0; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 100, 0 }; private int preSelectionPId = 1; private String[] columnNames = { FilePageLabels.FILE_API_LIST_VIEW_INDEX, @@ -82,14 +78,12 @@ public class FileApiListView extends DAView { FileApiListTable tableComp = null; public FileApiListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(FilePageLabels.FILE_API_LIST_VIEW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(FilePageLabels.FILE_API_LIST_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new FileApiListTable(contents, SWT.NONE, SWT.MULTI @@ -145,44 +139,51 @@ public class FileApiListView extends DAView { } @Override - public void updateView(DASelectionData data) { - if (!(data.getData() instanceof FileChartData)) { - selectionStartTime = data.getStartTime(); - selectionEndTime = data.getEndTime(); - } else { - this.data = (FileChartData) data.getData(); - } - tableComp.getTable().removeAll(); - tableComp.updateTable(); - tableComp.setSelectionByTime(selectionStartTime, selectionEndTime); - } - - @Override - public void setSelection(LogData data) { - if (null == data) { + public void updateView(DAViewData data) { + if (!(data instanceof DASelectionData)) return; - } - int seq = data.getSeq(); - tableComp.updateTable(); - int nSize = tableComp.getTable().getItemCount(); - for (int ii = 0; ii < nSize; ii++) { - if (tableComp.getTable().getItem(ii).getText(0) - .equals(Integer.toString(seq))) { - tableComp.getTable().setSelection(ii); - tableComp - .getTable() - .getVerticalBar() - .setSelection( - getScrollSelectionIndex(tableComp.getTable(), - ii)); - tableComp.updateTable(); + + DASelectionData seldata = (DASelectionData) data; + + if(seldata.isLogData()) { + Object odata = seldata.getData(); + if(!(odata instanceof LogData) || odata == null) + return; + + LogData ldata = (LogData) odata; + + int seq = ldata.getSeq(); + tableComp.updateTable(); + int nSize = tableComp.getTable().getItemCount(); + for (int ii = 0; ii < nSize; ii++) { + if (tableComp.getTable().getItem(ii).getText(0) + .equals(Integer.toString(seq))) { + tableComp.getTable().setSelection(ii); + tableComp + .getTable() + .getVerticalBar() + .setSelection( + getScrollSelectionIndex(tableComp.getTable(), + ii)); + tableComp.updateTable(); + } } + long selectedTime = ldata.getTime(); + DASelectionData selection = new DASelectionData(FilePage.apilistViewID, + selectedTime, selectedTime, + tableComp.getTable().getSelection(), tableComp.getTable()); + AnalyzerManager.getCurrentPage().updateView(selection); + } else { + if (!(seldata.getData() instanceof FileChartData)) { + selectionStartTime = seldata.getStartTime(); + selectionEndTime = seldata.getEndTime(); + } else { + this.data = (FileChartData) seldata.getData(); + } + tableComp.getTable().removeAll(); + tableComp.updateTable(); + tableComp.setSelectionByTime(selectionStartTime, selectionEndTime); } - long selectedTime = data.getTime(); - DASelectionData selData = new DASelectionData(FileApiListView.ID, - selectedTime, selectedTime, - tableComp.getTable().getSelection(), tableComp.getTable()); - AnalyzerManager.getCurrentPage().updatePage(selData); } private int getScrollSelectionIndex(Grid table, int selection) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java index 044b768..701a3ba 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java @@ -29,21 +29,19 @@ package org.tizen.dynamicanalyzer.ui.file; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.logparser.LogListQueue; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -public class FileChartManager implements Runnable { - - private LogListQueue logListQueue = null; - private Thread updateLogThread = null; +public class FileChartManager extends PageDataManager { private FileDataMaker fileDataMaker = null; - private static FileChartManager instance = null; - public FileChartManager() { + private FileChartManager() { fileDataMaker = new FileDataMaker(AnalyzerManager.getFailedChecker(), AnalyzerManager.getLeakDetector(), AnalyzerManager.getWarningChecker()); @@ -56,58 +54,26 @@ public class FileChartManager implements Runnable { return instance; } - public LogListQueue getLogListQueue() { - if (null == logListQueue) { - logListQueue = new LogListQueue(); - } - return logListQueue; - } - - public void startUpdateLogThread() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - updateLogThread = new Thread(null, getInstance(), - AnalyzerConstants.FILE_CHART_MANAGER_THREAD); - updateLogThread.start(); - } - } - - public void stopUpdateLogThread() { - if (null != updateLogThread && updateLogThread.isAlive()) { - try { - sendNotify(); - updateLogThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("file chart manager joined!"); //$NON-NLS-1$ - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - public boolean isThreadAlive() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - return false; - } - return true; - } - public FileDataMaker getFileDataMaker() { return fileDataMaker; } - /*** make file data thread ***/ @Override public void run() { - LogListQueue logListQueue = getInstance().getLogListQueue(); while (!AnalyzerManager.isExit()) { - List logs = logListQueue.getFirst(); - if (null == logs) { + LogPackage pack = pollPack(); + if(pack == null) // end of thread break; + + Logs logs = pack.getLogs(DataChannelConstants.MSG_PROBE_FILE); + if (null != logs && (logs.getRawLogs().size() != 0)) { + List inputs = logs.getLogs(); + getFileDataMaker().makeData(inputs); } - getInstance().getFileDataMaker().makeData(logs); } /* log for debug */ - System.out.println("file manager thread end!!"); //$NON-NLS-1$ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { @@ -115,13 +81,6 @@ public class FileChartManager implements Runnable { fileDataMaker.clear(); } - public static void sendNotify() { - LogListQueue logListQueue = getInstance().getLogListQueue(); - synchronized (logListQueue) { - logListQueue.notifyAll(); - } - } - public int[] getParentChartIndex(int seq) { int parentChartIndex = -1; FileChartData chartData = null; 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 747a2c4..d9f1ee4 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 @@ -27,8 +27,6 @@ package org.tizen.dynamicanalyzer.ui.file; -import java.util.List; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.events.PaintEvent; @@ -39,14 +37,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -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.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; @@ -54,15 +48,15 @@ import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardSelectionListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class FileChartView extends DAView { - public static final String ID = FileChartView.class.getName(); +public class FileChartView extends DAViewComposite { public final static int FILE_CHART_HEIGHT = 40; private final Composite contents; @@ -73,13 +67,12 @@ public class FileChartView extends DAView { .getInstance(); public FileChartView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(FilePageLabels.FILE_CHART_FILE); + setTitle(FilePageLabels.FILE_CHART_FILE); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); contents.setLayout(stackLayout); @@ -91,9 +84,9 @@ public class FileChartView extends DAView { public void handleSelectionEvent(DAChartBoardItem item) { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - FileChartView.ID, + FilePage.chartViewID, (long) (((DAChartPlotIntervalMarker) fileChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -172,45 +165,41 @@ public class FileChartView extends DAView { } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - - double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; - double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; - // double middleTime = (startTime + endTime) / 2.0; - // if (start == end) { - // middleTime = startTime; - // } - - DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; - - // chartBoard.setVisibleMiddleTime(middleTime); - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); - } - - @Override - public void setSelection(LogData data) { - if (null == data) { + public void updateView(DAViewData data) { + if (!(data instanceof DASelectionData)) return; - } - int seq = data.getSeq(); - int selectedIndex[] = FileChartManager.getInstance() - .getParentChartIndex(seq); - fileChart.selectItem(selectedIndex[0], FileChartManager.getInstance() - .getChildChartIndex(selectedIndex[1], seq)); - } - @Override - public void updateLog(LogPackage logPack) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_FILE); - if (null == logs || logs.getRawLogs().size() == 0) { - return; + DASelectionData selData = (DASelectionData) data; + + if(selData.isLogData()) { + Object odata = selData.getData(); + if(!(odata instanceof LogData) || odata == null) + return; + + LogData ldata = (LogData) odata; + int seq = ldata.getSeq(); + int selectedIndex[] = FileChartManager.getInstance() + .getParentChartIndex(seq); + fileChart.selectItem(selectedIndex[0], FileChartManager.getInstance() + .getChildChartIndex(selectedIndex[1], seq)); + } else { + long start = selData.getStartTime(); + long end = selData.getEndTime(); + + double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; + double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; + // double middleTime = (startTime + endTime) / 2.0; + // if (start == end) { + // middleTime = startTime; + // } + + DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + + // chartBoard.setVisibleMiddleTime(middleTime); + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); } - List inputs = logs.getLogs(); - FileChartManager.getInstance().getLogListQueue().putLog(inputs); } @Override @@ -248,5 +237,14 @@ public class FileChartView extends DAView { rangeMarker.setAlpha((int) (255 * 0.25)); board.addIntervalMarker(rangeMarker); } + + public void setRangeMarker(double starttime, double endtime) { + fileChart.setTimelineMarkerStartTime(starttime); + fileChart.setTimelineMarkerEndTime(endtime); + + ((DAChartPlotIntervalMarker) fileChart.getMarkers().get( + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + starttime, endtime); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java index 299134b..2896232 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java @@ -37,19 +37,15 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.utils.Formatter; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class FileDetailInfoView extends DAView { - - public static final String ID = FileDetailInfoView.class.getName(); - +public class FileDetailInfoView extends DAViewComposite { private Canvas canvas = null; private String fileName = AnalyzerLabels.EMPTY_STRING; private String filePath = AnalyzerLabels.EMPTY_STRING; @@ -60,9 +56,6 @@ public class FileDetailInfoView extends DAView { private int apiCount = 0; private int failedApiCount = 0; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - private void init() { fileName = AnalyzerLabels.EMPTY_STRING; filePath = AnalyzerLabels.EMPTY_STRING; @@ -75,14 +68,12 @@ public class FileDetailInfoView extends DAView { } public FileDetailInfoView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(FilePageLabels.FILE_DETAILS_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(FilePageLabels.FILE_DETAILS_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.setLayout(new FillLayout()); canvas = new Canvas(contents, SWT.TRANSPARENT); @@ -159,7 +150,7 @@ public class FileDetailInfoView extends DAView { } @Override - public void updateView(DASelectionData data) { + public void updateView(DAViewData data) { updateData(); } @@ -170,7 +161,7 @@ public class FileDetailInfoView extends DAView { private void updateData() { FileApiListView view = (FileApiListView) AnalyzerManager - .getCurrentPage().getViewMap().get(FileApiListView.ID); + .getCurrentPage().getView(FilePage.apilistViewID); FileChartData selectData = view.getPageData(); if (null == selectData) { 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 347e709..de74b1e 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,20 +34,24 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class FilePage extends DAPageComposite { - public static final String ID = FilePage.class.getName(); + // page and view IDs + public static final String pageID = FilePage.class.getName(); + public static final String chartViewID = FileChartView.class.getName(); + public static final String apilistViewID = FileApiListView.class.getName(); + public static final String detailViewID = FileDetailInfoView.class.getName(); + SashForm baseForm; SashForm leftForm; SashForm rightForm; public FilePage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_FILE; + setTitle(AnalyzerLabels.COOLBAR_AREA_FILE); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_FILE_TOOLTIP); this.setLayout(new FillLayout()); @@ -67,19 +71,13 @@ public class FilePage extends DAPageComposite { rightForm = new SashForm(baseForm, SWT.VERTICAL); - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); - addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView.setObservingViews(new String[] { FileApiListView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { FileApiListView.ID }); - tabView.addView(callstack, false); - } + ScreenshotTabComposite tabview = new ScreenshotTabComposite(rightForm, + SWT.NONE, FilePage.pageID); + tabview.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { FilePage.apilistViewID }); + tabview.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { FilePage.apilistViewID }); + addView(tabview); // FILE_DETAIL = 3; FileDetailInfoView detailInfo = new FileDetailInfoView(rightForm, @@ -92,11 +90,22 @@ public class FilePage extends DAPageComposite { baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); + + DataManagerRegistry.registerPageDataManager(FileChartManager.getInstance()); } @Override - protected void setFormWeights() { - baseForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + baseForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java index 47e4ee9..3eb4311 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java @@ -39,14 +39,15 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.ui.file.FileChartView; -import org.tizen.dynamicanalyzer.ui.range.RangeProfilingView; -import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView; -import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.ui.file.FilePage; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.ui.range.RangePage; +import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.utils.Formatter; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; public class CallstackTable extends DATableComposite { @@ -57,8 +58,8 @@ public class CallstackTable extends DATableComposite { @Override public void widgetSelected(SelectionEvent e) { - AnalyzerManager.getCurrentPage().controlSelection( - DATabComposite.ID); + AnalyzerManager.getCurrentPage().updateView( + new DAViewData(ScreenshotTabComposite.tabID, null)); GridItem[] sels = table.getSelection(); if (sels.length < 0) { return; @@ -68,16 +69,12 @@ public class CallstackTable extends DATableComposite { @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - } }); } @Override public void updateTable() { - // TODO Auto-generated method stub - } public void updateCallstackTable(DASelectionData selData) { @@ -85,12 +82,12 @@ public class CallstackTable extends DATableComposite { if (null == selData) { return; } - String viewId = selData.getViewId(); + String viewId = selData.getViewID(); if (null == viewId || viewId.isEmpty() - || viewId.equals(FileChartView.ID) - || viewId.equals(UIFunctionProfilingView.ID) - || viewId.equals(RangeProfilingView.ID) - || viewId.equals(FunctionUsageProfilingView.ID)) { + || viewId.equals(FilePage.chartViewID) + || viewId.equals(UIPage.profilingViewID) + || viewId.equals(RangePage.profilingViewID) + || viewId.equals(SummaryPage.profilingViewID)) { return; } Object obj = selData.getData(); @@ -187,7 +184,6 @@ public class CallstackTable extends DATableComposite { @Override protected List makeTableInput() { - // TODO Auto-generated method stub return null; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackView.java index a6f3a60..43bc451 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackView.java @@ -37,21 +37,18 @@ import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.ui.page.ViewAction; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class CallstackView extends DAView { - public static final String ID = CallstackView.class.getName(); - +public class CallstackView extends DAViewComposite { private DATableComposite callstackTableComp = null; private String[] columnNames = { InformationViewLabels.CALLSTACK_VIEW_FUNCTION, @@ -63,13 +60,12 @@ public class CallstackView extends DAView { Composite contents = null; public CallstackView(Composite parent, int style) { - super(parent, style); - name = InformationViewLabels.CALLSTACK_VIEW_TITLE; + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(InformationViewLabels.CALLSTACK_VIEW_TITLE); - contents = viewContainer.getContentArea(); + setTitle(InformationViewLabels.CALLSTACK_VIEW_TITLE); + + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); @@ -99,8 +95,8 @@ public class CallstackView extends DAView { } int size = observingViews.length; for (int i = 0; i < size; i++) { - ViewAction view = AnalyzerManager.getCurrentPage().getView( - observingViews[i]); + DAViewComposite view = (DAViewComposite) AnalyzerManager + .getCurrentPage().getView(observingViews[i]); Control control = view.getControl(); Grid table = null; if (control instanceof DATableComposite) { @@ -155,8 +151,17 @@ public class CallstackView extends DAView { } @Override - public void updateView(DASelectionData data) { - ((CallstackTable) callstackTableComp).updateCallstackTable(data); + public void updateView(DAViewData data) { + if (!(data instanceof DASelectionData)) + return; + + DASelectionData seldata = (DASelectionData) data; + + if(seldata.isLogData()) { + updateView(); + } else { + ((CallstackTable) callstackTableComp).updateCallstackTable(seldata); + } } @Override @@ -169,9 +174,4 @@ public class CallstackView extends DAView { return callstackTableComp; } - @Override - public void setSelection(LogData data) { - updateView(); - } - } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/score/ScoreView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/score/ScoreView.java index 1448f0c..d77ecb4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/score/ScoreView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/score/ScoreView.java @@ -41,17 +41,13 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; - -public class ScoreView extends DAView { - - public static final String ID = ScoreView.class.getName(); +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +public class ScoreView extends DAViewComposite { private Canvas scoreBoard = null; private Canvas scoreInfo = null; @@ -67,7 +63,7 @@ public class ScoreView extends DAView { private List columnValue = null; public ScoreView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); if (null == scoreImage) { @@ -98,9 +94,8 @@ public class ScoreView extends DAView { columnValue.add(0); } - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(InformationViewLabels.SCORE_VIEW_SCORE); - Composite contents = viewContainer.getContentArea(); + setTitle(InformationViewLabels.SCORE_VIEW_SCORE); + Composite contents = getContentArea(); contents.setBackground(ColorResources.TABLE_CONTENTS_NORMAL); contents.setLayout(new FormLayout()); scoreBoard = new Canvas(contents, SWT.TRANSPARENT); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EmulatorSnapshot.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java similarity index 87% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EmulatorSnapshot.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java index 47e3ba0..28a1302 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EmulatorSnapshot.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.io.File; @@ -37,14 +37,14 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.utils.JsonUtil; -public class EmulatorSnapshot implements ILsn { +public class EmulatorScreenshot implements ILsn { - private final String SNAPSHOT = "Snapshot"; + private final String SCREENSHOT = "Snapshot"; private int filecount = 0; - public EmulatorSnapshot() { - EventMgr.getInstance().AddLsnSet(SNAPSHOT); - EventMgr.getInstance().AddLsn(SNAPSHOT, this); + public EmulatorScreenshot() { + EventMgr.getInstance().AddLsnSet(SCREENSHOT); + EventMgr.getInstance().AddLsn(SCREENSHOT, this); } @Override @@ -73,7 +73,7 @@ public class EmulatorSnapshot implements ILsn { String msg = JsonUtil.encodeString(JsonUtil.CMD_EXECUTE, JsonUtil.CMD_SCREENDUMP, JsonUtil.CMD_ARGS, JsonUtil.encodeObject(JsonUtil.ARG_FILENAME, getFilePath()), - SNAPSHOT); + SCREENSHOT); return msg; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EventMgr.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EventMgr.java similarity index 97% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EventMgr.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EventMgr.java index fa49456..5d98e3a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/EventMgr.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EventMgr.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import org.json.simple.JSONObject; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ILsn.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ILsn.java similarity index 95% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ILsn.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ILsn.java index 3708eea..f20b82b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ILsn.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ILsn.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import org.json.simple.JSONObject; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMessage.java similarity index 95% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMessage.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMessage.java index 9e0f8bf..bf6f3e9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMessage.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import org.json.simple.JSONObject; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMsgProc.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMsgProc.java similarity index 89% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMsgProc.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMsgProc.java index 36a7131..3df3d9e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IMsgProc.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IMsgProc.java @@ -28,9 +28,9 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; public interface IMsgProc { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IconView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IconView.java similarity index 98% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IconView.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IconView.java index bb344ad..0456b99 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/IconView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/IconView.java @@ -24,7 +24,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.ArrayList; import java.util.List; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ImageViewer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java similarity index 85% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ImageViewer.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java index 3960ac1..2ea0b1a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ImageViewer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java @@ -24,7 +24,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.io.File; import java.util.List; @@ -50,10 +50,11 @@ 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.SnapshotConstants; +import org.tizen.dynamicanalyzer.common.ScreenshotConstants; import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; public class ImageViewer extends Composite { @@ -73,28 +74,28 @@ public class ImageViewer extends Composite { public ImageData(int type) { gc = null; - if (type == SnapshotConstants.IMAGE_TYPE_WIDE) { - imgWidth = SnapshotConstants.DEFAULT_W_IMAGE_WIDTH; - imgHeight = SnapshotConstants.DEFAULT_W_IMAGE_HEIGHT; - marginX = SnapshotConstants.DEFAULT_IMAGE_MARGIN_X; - marginY = SnapshotConstants.DEFAULT_IMAGE_MARGIN_Y; - maxImageWidth = SnapshotConstants.MAX_W_IMAGE_WIDTH; - maxImageHeight = SnapshotConstants.MAX_W_IMAGE_HEIGHT; - minImageWidth = SnapshotConstants.MIN_W_IMAGE_WIDTH; - minImageHeight = SnapshotConstants.MIN_W_IMAGE_HEIGHT; - imgWidthRate = SnapshotConstants.W_IMAGE_WIDTH_RATE; - imgHeightRate = SnapshotConstants.W_IMAGE_HEIGHT_RATE; + if (type == ScreenshotConstants.IMAGE_TYPE_WIDE) { + imgWidth = ScreenshotConstants.DEFAULT_W_IMAGE_WIDTH; + imgHeight = ScreenshotConstants.DEFAULT_W_IMAGE_HEIGHT; + marginX = ScreenshotConstants.DEFAULT_IMAGE_MARGIN_X; + marginY = ScreenshotConstants.DEFAULT_IMAGE_MARGIN_Y; + maxImageWidth = ScreenshotConstants.MAX_W_IMAGE_WIDTH; + maxImageHeight = ScreenshotConstants.MAX_W_IMAGE_HEIGHT; + minImageWidth = ScreenshotConstants.MIN_W_IMAGE_WIDTH; + minImageHeight = ScreenshotConstants.MIN_W_IMAGE_HEIGHT; + imgWidthRate = ScreenshotConstants.W_IMAGE_WIDTH_RATE; + imgHeightRate = ScreenshotConstants.W_IMAGE_HEIGHT_RATE; } else { - imgWidth = SnapshotConstants.DEFAULT_IMAGE_WIDTH; - imgHeight = SnapshotConstants.DEFAULT_IMAGE_HEIGHT; - marginX = SnapshotConstants.DEFAULT_IMAGE_MARGIN_X; - marginY = SnapshotConstants.DEFAULT_IMAGE_MARGIN_Y; - maxImageWidth = SnapshotConstants.MAX_IMAGE_WIDTH; - maxImageHeight = SnapshotConstants.MAX_IMAGE_HEIGHT; - minImageWidth = SnapshotConstants.MIN_IMAGE_WIDTH; - minImageHeight = SnapshotConstants.MIN_IMAGE_HEIGHT; - imgWidthRate = SnapshotConstants.IMAGE_WIDTH_RATE; - imgHeightRate = SnapshotConstants.IMAGE_HEIGHT_RATE; + imgWidth = ScreenshotConstants.DEFAULT_IMAGE_WIDTH; + imgHeight = ScreenshotConstants.DEFAULT_IMAGE_HEIGHT; + marginX = ScreenshotConstants.DEFAULT_IMAGE_MARGIN_X; + marginY = ScreenshotConstants.DEFAULT_IMAGE_MARGIN_Y; + maxImageWidth = ScreenshotConstants.MAX_IMAGE_WIDTH; + maxImageHeight = ScreenshotConstants.MAX_IMAGE_HEIGHT; + minImageWidth = ScreenshotConstants.MIN_IMAGE_WIDTH; + minImageHeight = ScreenshotConstants.MIN_IMAGE_HEIGHT; + imgWidthRate = ScreenshotConstants.IMAGE_WIDTH_RATE; + imgHeightRate = ScreenshotConstants.IMAGE_HEIGHT_RATE; } } } @@ -114,7 +115,7 @@ public class ImageViewer extends Composite { int childShellWidth = 0; int childShellHeight = 0; private int state = MOUSE_EXIT; - private int imageState = SnapshotConstants.IMAGE_TYPE_NORMAL; + private int imageState = ScreenshotConstants.IMAGE_TYPE_NORMAL; private boolean mouseDown = false; private int currentImageIndex = 0; private boolean leftEnable = false; @@ -160,8 +161,8 @@ public class ImageViewer extends Composite { int iw = bounds.width; int ih = bounds.height; - int imageType = iw > ih ? SnapshotConstants.IMAGE_TYPE_WIDE - : SnapshotConstants.IMAGE_TYPE_NORMAL; + int imageType = iw > ih ? ScreenshotConstants.IMAGE_TYPE_WIDE + : ScreenshotConstants.IMAGE_TYPE_NORMAL; ImageData imageData = new ImageData(imageType); imageData.gc = e.gc; @@ -206,14 +207,14 @@ public class ImageViewer extends Composite { GC gc = new GC(buffer); int ix = 1, iy = 1; - int width = SnapshotConstants.MIN_IMAGE_WIDTH; - int height = SnapshotConstants.MIN_IMAGE_HEIGHT; + int width = ScreenshotConstants.MIN_IMAGE_WIDTH; + int height = ScreenshotConstants.MIN_IMAGE_HEIGHT; if (imgData.imgHeight > imgData.imgWidth) { ix = (bounds.width - width) / 2; } else { - width = SnapshotConstants.MIN_IMAGE_HEIGHT; - height = SnapshotConstants.MIN_IMAGE_WIDTH; + width = ScreenshotConstants.MIN_IMAGE_HEIGHT; + height = ScreenshotConstants.MIN_IMAGE_WIDTH; iy = (bounds.height - height) / 2; } @@ -288,17 +289,17 @@ public class ImageViewer extends Composite { currentImageIndex = index; canvas.redraw(); Rectangle rect = img.getBounds(); - int imgType = SnapshotConstants.IMAGE_TYPE_NORMAL; + int imgType = ScreenshotConstants.IMAGE_TYPE_NORMAL; if (rect.width > rect.height) { - imgType = SnapshotConstants.IMAGE_TYPE_WIDE; + imgType = ScreenshotConstants.IMAGE_TYPE_WIDE; } else { - imgType = SnapshotConstants.IMAGE_TYPE_NORMAL; + imgType = ScreenshotConstants.IMAGE_TYPE_NORMAL; } if (childShell != null) { if (imageState != imgType) { childShell.close(); childShell = null; - if (imgType == SnapshotConstants.IMAGE_TYPE_WIDE) { + if (imgType == ScreenshotConstants.IMAGE_TYPE_WIDE) { childShellWidth = defaultShellMaxHeight; childShellHeight = defaultShellMaxWidth; } else { @@ -442,8 +443,9 @@ public class ImageViewer extends Composite { private void widgetSelected(String timeStr) { long time = Long.parseLong(timeStr); - AnalyzerManager.getCurrentPage().updatePage( - new DASelectionData(SnapshotView.ID, time, time, null, null)); + AnalyzerManager.getCurrentPage().updateView( + new DASelectionData(ScreenshotTabComposite.imageViewerID, time, + time, null, null)); } private void leftArrowAction() { @@ -465,7 +467,7 @@ public class ImageViewer extends Composite { private void setShellSizes(int type) { imageState = type; - if (type == SnapshotConstants.IMAGE_TYPE_WIDE) { + if (type == ScreenshotConstants.IMAGE_TYPE_WIDE) { shellMaxHeight = defaultShellMaxWidth; shellMaxWidth = defaultShellMaxHeight; childWidth = defaultChildHeight; @@ -483,7 +485,7 @@ public class ImageViewer extends Composite { } private void setChildShellSizes(int type) { - if (type == SnapshotConstants.IMAGE_TYPE_WIDE) { + if (type == ScreenshotConstants.IMAGE_TYPE_WIDE) { shellMaxHeight = defaultShellMaxWidth; shellMaxWidth = defaultShellMaxHeight; childWidth = defaultChildHeight; @@ -502,9 +504,9 @@ public class ImageViewer extends Composite { } else if (enableAnimation) { Rectangle rect = image.getBounds(); if (rect.width > rect.height) { - setShellSizes(SnapshotConstants.IMAGE_TYPE_WIDE); + setShellSizes(ScreenshotConstants.IMAGE_TYPE_WIDE); } else { - setShellSizes(SnapshotConstants.IMAGE_TYPE_NORMAL); + setShellSizes(ScreenshotConstants.IMAGE_TYPE_NORMAL); } } childShell = new Shell(parent.getShell(), SWT.ON_TOP); @@ -527,8 +529,8 @@ public class ImageViewer extends Composite { Rectangle bounds = image.getBounds(); int iw = bounds.width; int ih = bounds.height; - int imageType = iw > ih ? SnapshotConstants.IMAGE_TYPE_WIDE - : SnapshotConstants.IMAGE_TYPE_NORMAL; + int imageType = iw > ih ? ScreenshotConstants.IMAGE_TYPE_WIDE + : ScreenshotConstants.IMAGE_TYPE_NORMAL; ImageData imageData = new ImageData(imageType); imageData.gc = e.gc; @@ -536,9 +538,9 @@ public class ImageViewer extends Composite { imageData.imgHeight = ih; if (iw > ih) { - setChildShellSizes(SnapshotConstants.IMAGE_TYPE_WIDE); + setChildShellSizes(ScreenshotConstants.IMAGE_TYPE_WIDE); } else { - setChildShellSizes(SnapshotConstants.IMAGE_TYPE_NORMAL); + setChildShellSizes(ScreenshotConstants.IMAGE_TYPE_NORMAL); } Rectangle rects = popup.getBounds(); int cw = rects.width - 2; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenMap.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java similarity index 96% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenMap.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java index ad9f615..303cde6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenMap.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenMap.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.Map; import java.util.HashMap; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenSet.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenSet.java similarity index 96% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenSet.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenSet.java index a81fb10..5706975 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ListenSet.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ListenSet.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.ArrayList; import java.util.List; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageQueue.java similarity index 93% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageQueue.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageQueue.java index 907ac47..655a29a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageQueue.java @@ -28,11 +28,11 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.LinkedList; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; public class MessageQueue { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageSender.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java similarity index 87% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageSender.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java index c5e2f0b..d6c25f9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MessageSender.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java @@ -28,14 +28,14 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.io.IOException; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type; public class MessageSender { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgMgr.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java similarity index 93% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgMgr.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java index ca76cd1..7f2c25a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgMgr.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java @@ -28,15 +28,15 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; import org.tizen.dynamicanalyzer.utils.JsonUtil; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type; public class MsgMgr { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_KeepAliveReq.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_KeepAliveReq.java similarity index 90% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_KeepAliveReq.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_KeepAliveReq.java index 9bd0085..2c42e8b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_KeepAliveReq.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_KeepAliveReq.java @@ -28,9 +28,9 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; public class MsgProc_KeepAliveReq implements IMsgProc { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_MonitorNtf.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_MonitorNtf.java similarity index 86% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_MonitorNtf.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_MonitorNtf.java index 9dd13cf..442ed1e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/MsgProc_MonitorNtf.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgProc_MonitorNtf.java @@ -28,10 +28,10 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf; public class MsgProc_MonitorNtf implements IMsgProc { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java new file mode 100644 index 0000000..ccc67e9 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java @@ -0,0 +1,71 @@ +package org.tizen.dynamicanalyzer.ui.info.screenshot; + +import java.util.ArrayList; +import java.util.List; + +import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.constant.CommonConstants; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; +import org.tizen.dynamicanalyzer.swap.model.data.LogData; +import org.tizen.dynamicanalyzer.swap.model.data.SystemData; + +public class ScreenshotDataManager extends PageDataManager { + private static ScreenshotDataManager instance = null; + private List lastCpuRate = null; + private int lastProcessMemory = 0; + private long lastStartTime = 0; + + private ScreenshotDataManager() { + lastCpuRate = new ArrayList(); + } + + public synchronized static ScreenshotDataManager getInstance() { + if(instance == null) { + instance = new ScreenshotDataManager(); + } + return instance; + } + + @Override + public void run() { + while (!AnalyzerManager.isExit()) { + LogPackage pack = pollPack(); + if(pack == null) // stop thread + break; + + Logs logs = pack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); + if (null != logs && null != logs.getRawLogs() && !logs.getRawLogs().isEmpty()) { + List inputs = logs.getRawLogs(); + int lastIndex = inputs.size() - 1; + SystemData input = (SystemData) inputs.get(lastIndex); + + String[] cpuRates = input.getCpuLoad().split(CommonConstants.COMMA); + for (int i = 0; i < cpuRates.length - 1; i++) { + String cpu = cpuRates[i].trim(); + lastCpuRate.add(new Long((long)Float.parseFloat(cpu))); + } + + lastProcessMemory = input.getResidentMemory(); + lastStartTime = input.getTime(); + } + } + + /* log for debug */ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + } + + public List getLastCpuRate() { + return lastCpuRate; + } + + public int getLastProcessMemory() { + return lastProcessMemory; + } + + public long getLastStartTime() { + return lastStartTime; + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ScreenshotTimerTask.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotTimerTask.java similarity index 80% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ScreenshotTimerTask.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotTimerTask.java index 5c86840..bdc29cc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ScreenshotTimerTask.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotTimerTask.java @@ -1,4 +1,4 @@ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.TimerTask; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java similarity index 77% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java index 118c5d2..ba931b6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotView.java @@ -24,7 +24,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.util.ArrayList; import java.util.List; @@ -50,21 +50,17 @@ import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.InformationViewLabels; +import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.sql.SqlManager; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.SystemData; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.page.ViewAction; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; @@ -73,16 +69,15 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.graph.bar.FourBarGraph; import org.tizen.dynamicanalyzer.widgets.graph.circular.CircularGraph; -public class SnapshotView extends DAView { - - public static final String ID = SnapshotView.class.getName(); - - private final int SNAPSHOT_SIZE = 218; +public class ScreenshotView extends DAViewComposite { + private final int SCREENSHOT_SIZE = 218; public final static int SELECTION_MARKER_INDEX = 0; - ImageViewer snapshot; + ImageViewer screenshot; CircularGraph processGraph; FourBarGraph cpuGrp; private String[] observingViews = null; @@ -96,51 +91,53 @@ public class SnapshotView extends DAView { private long lastStartTime = 0; private long selectTime = -1; - private String pageName = null; + @SuppressWarnings("unused") + private String pageID = null; private DACustomButton latestButton = null; - public SnapshotView(Composite parent, int style, boolean title, String page) { - super(parent, style); - name = InformationViewLabels.SNAPSHOT_VIEW_TITLE; - pageName = page; + private ScreenshotDataManager dataManager = ScreenshotDataManager + .getInstance(); + + public ScreenshotView(Composite parent, int style, boolean title, + String page) { + super(parent, style, title); + pageID = page; this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, title); - viewContainer - .setTitleText(InformationViewLabels.SNAPSHOT_VIEW_CURRENT_VIEW); - Composite contents = viewContainer.getContentArea(); + setTitle(InformationViewLabels.SNAPSHOT_VIEW_TITLE); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.addControlListener(new ControlListener() { @Override public void controlResized(ControlEvent e) { - FormData data = (FormData) snapshot.getLayoutData(); - data.left = new FormAttachment(50, -SNAPSHOT_SIZE / 2); + FormData data = (FormData) screenshot.getLayoutData(); + data.left = new FormAttachment(50, -SCREENSHOT_SIZE / 2); data = (FormData) bottomComp.getLayoutData(); - data.left = new FormAttachment(50, -SNAPSHOT_SIZE / 2); - data.right = new FormAttachment(50, SNAPSHOT_SIZE / 2); + data.left = new FormAttachment(50, -SCREENSHOT_SIZE / 2); + data.right = new FormAttachment(50, SCREENSHOT_SIZE / 2); } @Override public void controlMoved(ControlEvent e) { } }); - snapshot = new ImageViewer(contents, SWT.NONE); + screenshot = new ImageViewer(contents, SWT.NONE); FormData data = new FormData(); data.top = new FormAttachment(0, 1); data.left = new FormAttachment(0, 0); - data.width = SNAPSHOT_SIZE; - data.height = SNAPSHOT_SIZE; - snapshot.setLayoutData(data); - snapshot.setEnable(true); + data.width = SCREENSHOT_SIZE; + data.height = SCREENSHOT_SIZE; + screenshot.setLayoutData(data); + screenshot.setEnable(true); bottomComp = new Composite(contents, SWT.NONE); bottomComp.setLayout(new FormLayout()); data = new FormData(); - data.top = new FormAttachment(snapshot, 3); + data.top = new FormAttachment(screenshot, 3); data.left = new FormAttachment(0, 0); data.right = new FormAttachment(100, 0); data.height = 90; @@ -236,12 +233,17 @@ public class SnapshotView extends DAView { @Override public void handleClickEvent(DACustomButton button) { setLatestButtonEnable(false); - setSelectTime(lastStartTime); - DASelectionData selData = new DASelectionData(ID, ToolbarArea - .getInstance().getTime(), ToolbarArea.getInstance() - .getTime(), null, latestButton); - AnalyzerManager.getCurrentPage().updatePage(selData); + long selStartTime = ToolbarArea.getInstance().getTime(); + setSelectTime(selStartTime); + setStartTime(selStartTime); + updateView(false); + + // TODO : erase this. i think this is unnecessary. useless. + DASelectionData selData = new DASelectionData( + ScreenshotTabComposite.screenshotViewID, selStartTime, + ToolbarArea.getInstance().getTime(), null, latestButton); + AnalyzerManager.getCurrentPage().updateView(selData); updateView(); } @@ -270,6 +272,8 @@ public class SnapshotView extends DAView { } } }); + + DataManagerRegistry.registerPageDataManager(dataManager); } public void setObservingViews(String[] viewIds) { @@ -303,26 +307,28 @@ public class SnapshotView extends DAView { } @Override - public void updateView(DASelectionData selData) { - setLatestButtonEnable(true); - long selStartTime = selData.getStartTime(); - if (selData.getViewId().equals(SnapshotView.ID)) { - if (selData.getControl() == latestButton) { - setLatestButtonEnable(false); - } - if (selStartTime < 0) { - selStartTime = 0; - } - setSelectTime(selStartTime); - setStartTime(selectTime); - updateView(false); - } else { - if (selStartTime > lastStartTime) { - selStartTime = lastStartTime; + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + setLatestButtonEnable(true); + long selStartTime = selData.getStartTime(); + if (selData.getViewID() + .equals(ScreenshotTabComposite.imageViewerID)) { + if (selStartTime < 0) { + selStartTime = 0; + } + setSelectTime(selStartTime); + setStartTime(selectTime); + updateView(false); + } else { + if (selStartTime > lastStartTime) { + selStartTime = lastStartTime; + } + setSelectTime(selStartTime); + setStartTime(selectTime); + updateView(true); } - setSelectTime(selStartTime); - setStartTime(selectTime); - updateView(true); } } @@ -335,7 +341,7 @@ public class SnapshotView extends DAView { cpuGrp.setMaxSize(maxCpuUsage); cpuGrp.setCurrentValue(cpuUsage); if (isSnapshot) { - snapshot.drawSnapshot(Long.toString(startTime)); + screenshot.drawSnapshot(Long.toString(startTime)); } } }); @@ -347,6 +353,8 @@ public class SnapshotView extends DAView { latestButton.setButtonEnabled(false); } else if (latestButton.isButtonEnabled()) { setStartTime(selectTime); + } else { // latestButton is disabled + updateFromDataManager(); } Display.getDefault().syncExec(new Runnable() { @Override @@ -354,7 +362,7 @@ public class SnapshotView extends DAView { processGraph.update(maxMem, processMem); cpuGrp.setMaxSize(maxCpuUsage); cpuGrp.setCurrentValue(cpuUsage); - snapshot.drawSnapshot(Long.toString(startTime)); + screenshot.drawSnapshot(Long.toString(startTime)); } }); } @@ -365,8 +373,8 @@ public class SnapshotView extends DAView { } int size = observingViews.length; for (int i = 0; i < size; i++) { - ViewAction view = AnalyzerManager.getCurrentPage().getView( - observingViews[i]); + DAViewComposite view = (DAViewComposite) AnalyzerManager + .getCurrentPage().getView(observingViews[i]); Control control = view.getControl(); Grid table = null; @@ -407,32 +415,20 @@ public class SnapshotView extends DAView { } } - @Override - public void updateLog(LogPackage logPack) { - DAPageComposite currentPage = AnalyzerManager.getCurrentPage(); - if (currentPage.getViewName().equals(pageName) - && !latestButton.isButtonEnabled()) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); - if (null == logs || null == logs.getRawLogs() - || logs.getRawLogs().isEmpty()) { - return; - } - List inputs = logs.getRawLogs(); - int lastIndex = inputs.size() - 1; - SystemData input = (SystemData) inputs.get(lastIndex); - - String[] cpuRates = input.getCpuLoad().split(CommonConstants.COMMA); + private void updateFromDataManager() { + if (dataManager.isThreadAlive()) { + List cpuRates = dataManager.getLastCpuRate(); + int size = cpuRates.size(); cpuUsage.clear(); - for (int i = 0; i < cpuRates.length - 1; i++) { - String cpu = cpuRates[i].trim(); - long value = (long) Float.parseFloat(cpu); - cpuUsage.add(value); + for (int i = 0; i < size - 1; i++) { + cpuUsage.add(cpuRates.get(i)); } - long totalMem = AnalyzerManager.getProject().getSystemMemorySize(); - maxMem = totalMem; - processMem = input.getResidentMemory(); - lastStartTime = input.getTime(); + Project project = AnalyzerManager.getProject(); + if (project != null) + maxMem = project.getSystemMemorySize(); + processMem = dataManager.getLastProcessMemory(); + lastStartTime = dataManager.getLastStartTime(); setStartTime(lastStartTime); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketClient.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java similarity index 98% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketClient.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java index 9fcf899..9a46579 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketClient.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.io.BufferedReader; import java.io.Closeable; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketConstants.java similarity index 97% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketConstants.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketConstants.java index bf7d194..3b0c6c8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketConstants.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; public class SocketConstants { public static String DefaultIp = "localhost"; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java similarity index 94% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketMessage.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java index 9cff781..257f457 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java @@ -28,10 +28,10 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import org.eclipse.swt.widgets.Display; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; public class SocketMessage implements Runnable { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketReceive.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java similarity index 95% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketReceive.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java index 04f9c9a..f81534b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SocketReceive.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java @@ -28,7 +28,7 @@ * */ -package org.tizen.dynamicanalyzer.ui.info.snapshot; +package org.tizen.dynamicanalyzer.ui.info.screenshot; import java.io.BufferedReader; import java.io.DataInputStream; @@ -37,7 +37,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.nio.ByteBuffer; -import org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; import com.google.protobuf.CodedInputStream; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/Ecs.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/Ecs.java similarity index 82% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/Ecs.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/Ecs.java index 77ad643..b8ef0b1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/Ecs.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/Ecs.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ecs.proto -package org.tizen.dynamicanalyzer.ui.info.snapshot.ecs; +package org.tizen.dynamicanalyzer.ui.info.screenshot.ecs; public final class Ecs { private Ecs() {} @@ -96,14 +96,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -212,53 +212,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -267,7 +267,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -283,17 +283,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.newBuilder() @@ -327,23 +327,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -356,16 +356,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance()) return this; if (other.hasVersionStr()) { bitField0_ |= 0x00000001; versionStr_ = other.versionStr_; @@ -387,11 +387,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -590,14 +590,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -734,53 +734,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -789,7 +789,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -805,17 +805,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.newBuilder() @@ -851,23 +851,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_CheckVersionAns_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -884,16 +884,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance()) return this; if (other.hasErrcode()) { setErrcode(other.getErrcode()); } @@ -922,11 +922,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1143,14 +1143,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1255,53 +1255,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1310,7 +1310,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1326,17 +1326,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.newBuilder() @@ -1370,23 +1370,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1399,16 +1399,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance()) return this; if (other.hasTimeStr()) { bitField0_ |= 0x00000001; timeStr_ = other.timeStr_; @@ -1426,11 +1426,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1614,14 +1614,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1726,53 +1726,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1781,7 +1781,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1797,17 +1797,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.newBuilder() @@ -1841,23 +1841,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_KeepAliveAns_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1870,16 +1870,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance()) return this; if (other.hasTimeStr()) { bitField0_ |= 0x00000001; timeStr_ = other.timeStr_; @@ -1897,11 +1897,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2145,14 +2145,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2369,53 +2369,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2424,7 +2424,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2440,17 +2440,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.newBuilder() @@ -2492,23 +2492,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2537,16 +2537,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -2592,11 +2592,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2950,14 +2950,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3145,53 +3145,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3200,7 +3200,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3216,17 +3216,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.newBuilder() @@ -3264,23 +3264,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorAns_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3301,16 +3301,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance()) return this; if (other.hasErrcode()) { setErrcode(other.getErrcode()); } @@ -3344,11 +3344,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3699,14 +3699,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3923,53 +3923,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3978,7 +3978,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3994,17 +3994,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.newBuilder() @@ -4046,23 +4046,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_InjectorNtf_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4091,16 +4091,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -4146,11 +4146,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4529,14 +4529,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4753,53 +4753,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4808,7 +4808,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -4824,17 +4824,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.newBuilder() @@ -4876,23 +4876,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4921,16 +4921,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -4976,11 +4976,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5394,14 +5394,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5697,53 +5697,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5752,7 +5752,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5768,17 +5768,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.newBuilder() @@ -5824,23 +5824,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceAns_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5877,16 +5877,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance()) return this; if (other.hasErrcode()) { setErrcode(other.getErrcode()); } @@ -5944,11 +5944,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6434,14 +6434,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -6658,53 +6658,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6713,7 +6713,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6729,17 +6729,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.newBuilder() @@ -6781,23 +6781,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_DeviceNtf_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6826,16 +6826,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -6881,11 +6881,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7204,14 +7204,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7320,53 +7320,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7375,7 +7375,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7391,17 +7391,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.newBuilder() @@ -7435,23 +7435,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7464,16 +7464,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance()) return this; if (other.hasCommand()) { bitField0_ |= 0x00000001; command_ = other.command_; @@ -7495,11 +7495,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7733,14 +7733,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7952,53 +7952,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8007,7 +8007,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8023,17 +8023,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorAns_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorAns_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.newBuilder() @@ -8073,23 +8073,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorAns_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8114,16 +8114,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance()) return this; if (other.hasErrcode()) { setErrcode(other.getErrcode()); } @@ -8160,11 +8160,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8506,14 +8506,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8646,53 +8646,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8701,7 +8701,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8717,17 +8717,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.newBuilder() @@ -8763,23 +8763,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_MonitorNtf_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8796,16 +8796,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance()) return this; if (other.hasCommand()) { bitField0_ |= 0x00000001; command_ = other.command_; @@ -8830,11 +8830,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -9069,14 +9069,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9209,53 +9209,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9264,7 +9264,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -9280,17 +9280,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcReq_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcReq_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.newBuilder() @@ -9326,23 +9326,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcReq_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -9359,16 +9359,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -9393,11 +9393,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -9632,14 +9632,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9772,53 +9772,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9827,7 +9827,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -9843,17 +9843,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcNtf_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcNtf_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.newBuilder() @@ -9889,23 +9889,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_NfcNtf_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -9922,16 +9922,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance()) return this; if (other.hasCategory()) { bitField0_ |= 0x00000001; category_ = other.category_; @@ -9956,11 +9956,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10103,7 +10103,7 @@ public final class Ecs { /** * required .ECS.Master_Type type = 1; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type getType(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type getType(); // optional .ECS.CheckVersionReq checkversion_req = 2; /** @@ -10113,11 +10113,11 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq getCheckversionReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq getCheckversionReq(); /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder(); // optional .ECS.CheckVersionAns checkversion_ans = 3; /** @@ -10127,11 +10127,11 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns getCheckversionAns(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns getCheckversionAns(); /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder(); // optional .ECS.KeepAliveReq keepalive_req = 4; /** @@ -10141,11 +10141,11 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq getKeepaliveReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq getKeepaliveReq(); /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder(); // optional .ECS.KeepAliveAns keepalive_ans = 5; /** @@ -10155,11 +10155,11 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns getKeepaliveAns(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns getKeepaliveAns(); /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder(); // optional .ECS.InjectorReq injector_req = 6; /** @@ -10169,11 +10169,11 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq getInjectorReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq getInjectorReq(); /** * optional .ECS.InjectorReq injector_req = 6; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder(); // optional .ECS.InjectorAns injector_ans = 7; /** @@ -10183,11 +10183,11 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns getInjectorAns(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns getInjectorAns(); /** * optional .ECS.InjectorAns injector_ans = 7; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder(); // optional .ECS.InjectorNtf injector_ntf = 8; /** @@ -10197,11 +10197,11 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf getInjectorNtf(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf getInjectorNtf(); /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder(); // optional .ECS.DeviceReq device_req = 9; /** @@ -10211,11 +10211,11 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq getDeviceReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq getDeviceReq(); /** * optional .ECS.DeviceReq device_req = 9; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder(); // optional .ECS.DeviceAns device_ans = 10; /** @@ -10225,11 +10225,11 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns getDeviceAns(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns getDeviceAns(); /** * optional .ECS.DeviceAns device_ans = 10; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder(); // optional .ECS.DeviceNtf device_ntf = 11; /** @@ -10239,11 +10239,11 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf getDeviceNtf(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf getDeviceNtf(); /** * optional .ECS.DeviceNtf device_ntf = 11; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder(); // optional .ECS.MonitorReq monitor_req = 12; /** @@ -10253,11 +10253,11 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq getMonitorReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq getMonitorReq(); /** * optional .ECS.MonitorReq monitor_req = 12; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder(); // optional .ECS.MonitorAns monitor_ans = 13; /** @@ -10267,11 +10267,11 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns getMonitorAns(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns getMonitorAns(); /** * optional .ECS.MonitorAns monitor_ans = 13; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder(); // optional .ECS.MonitorNtf monitor_ntf = 14; /** @@ -10281,11 +10281,11 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf getMonitorNtf(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf getMonitorNtf(); /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder(); // optional .ECS.NfcReq nfc_req = 101; /** @@ -10303,7 +10303,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq getNfcReq(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq getNfcReq(); /** * optional .ECS.NfcReq nfc_req = 101; * @@ -10311,7 +10311,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder(); // optional .ECS.NfcNtf nfc_ntf = 102; /** @@ -10321,11 +10321,11 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf getNfcNtf(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf getNfcNtf(); /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder(); } /** * Protobuf type {@code ECS.Master} @@ -10380,7 +10380,7 @@ public final class Ecs { } case 8: { int rawValue = input.readEnum(); - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type value = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type.valueOf(rawValue); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type value = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -10390,11 +10390,11 @@ public final class Ecs { break; } case 18: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = checkversionReq_.toBuilder(); } - checkversionReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.PARSER, extensionRegistry); + checkversionReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(checkversionReq_); checkversionReq_ = subBuilder.buildPartial(); @@ -10403,11 +10403,11 @@ public final class Ecs { break; } case 26: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = checkversionAns_.toBuilder(); } - checkversionAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.PARSER, extensionRegistry); + checkversionAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(checkversionAns_); checkversionAns_ = subBuilder.buildPartial(); @@ -10416,11 +10416,11 @@ public final class Ecs { break; } case 34: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = keepaliveReq_.toBuilder(); } - keepaliveReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.PARSER, extensionRegistry); + keepaliveReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(keepaliveReq_); keepaliveReq_ = subBuilder.buildPartial(); @@ -10429,11 +10429,11 @@ public final class Ecs { break; } case 42: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = keepaliveAns_.toBuilder(); } - keepaliveAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.PARSER, extensionRegistry); + keepaliveAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(keepaliveAns_); keepaliveAns_ = subBuilder.buildPartial(); @@ -10442,11 +10442,11 @@ public final class Ecs { break; } case 50: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder subBuilder = null; if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = injectorReq_.toBuilder(); } - injectorReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.PARSER, extensionRegistry); + injectorReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(injectorReq_); injectorReq_ = subBuilder.buildPartial(); @@ -10455,11 +10455,11 @@ public final class Ecs { break; } case 58: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = injectorAns_.toBuilder(); } - injectorAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.PARSER, extensionRegistry); + injectorAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(injectorAns_); injectorAns_ = subBuilder.buildPartial(); @@ -10468,11 +10468,11 @@ public final class Ecs { break; } case 66: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = injectorNtf_.toBuilder(); } - injectorNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.PARSER, extensionRegistry); + injectorNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(injectorNtf_); injectorNtf_ = subBuilder.buildPartial(); @@ -10481,11 +10481,11 @@ public final class Ecs { break; } case 74: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = deviceReq_.toBuilder(); } - deviceReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.PARSER, extensionRegistry); + deviceReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(deviceReq_); deviceReq_ = subBuilder.buildPartial(); @@ -10494,11 +10494,11 @@ public final class Ecs { break; } case 82: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder subBuilder = null; if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = deviceAns_.toBuilder(); } - deviceAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.PARSER, extensionRegistry); + deviceAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(deviceAns_); deviceAns_ = subBuilder.buildPartial(); @@ -10507,11 +10507,11 @@ public final class Ecs { break; } case 90: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder subBuilder = null; if (((bitField0_ & 0x00000400) == 0x00000400)) { subBuilder = deviceNtf_.toBuilder(); } - deviceNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.PARSER, extensionRegistry); + deviceNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(deviceNtf_); deviceNtf_ = subBuilder.buildPartial(); @@ -10520,11 +10520,11 @@ public final class Ecs { break; } case 98: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder subBuilder = null; if (((bitField0_ & 0x00000800) == 0x00000800)) { subBuilder = monitorReq_.toBuilder(); } - monitorReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.PARSER, extensionRegistry); + monitorReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(monitorReq_); monitorReq_ = subBuilder.buildPartial(); @@ -10533,11 +10533,11 @@ public final class Ecs { break; } case 106: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder subBuilder = null; if (((bitField0_ & 0x00001000) == 0x00001000)) { subBuilder = monitorAns_.toBuilder(); } - monitorAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.PARSER, extensionRegistry); + monitorAns_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(monitorAns_); monitorAns_ = subBuilder.buildPartial(); @@ -10546,11 +10546,11 @@ public final class Ecs { break; } case 114: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder subBuilder = null; if (((bitField0_ & 0x00002000) == 0x00002000)) { subBuilder = monitorNtf_.toBuilder(); } - monitorNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.PARSER, extensionRegistry); + monitorNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(monitorNtf_); monitorNtf_ = subBuilder.buildPartial(); @@ -10559,11 +10559,11 @@ public final class Ecs { break; } case 810: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder subBuilder = null; if (((bitField0_ & 0x00004000) == 0x00004000)) { subBuilder = nfcReq_.toBuilder(); } - nfcReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.PARSER, extensionRegistry); + nfcReq_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(nfcReq_); nfcReq_ = subBuilder.buildPartial(); @@ -10572,11 +10572,11 @@ public final class Ecs { break; } case 818: { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder subBuilder = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder subBuilder = null; if (((bitField0_ & 0x00008000) == 0x00008000)) { subBuilder = nfcNtf_.toBuilder(); } - nfcNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.PARSER, extensionRegistry); + nfcNtf_ = input.readMessage(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(nfcNtf_); nfcNtf_ = subBuilder.buildPartial(); @@ -10598,14 +10598,14 @@ public final class Ecs { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_Master_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_Master_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_Master_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_Master_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -10626,7 +10626,7 @@ public final class Ecs { private int bitField0_; // required .ECS.Master_Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type type_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type type_; /** * required .ECS.Master_Type type = 1; */ @@ -10636,13 +10636,13 @@ public final class Ecs { /** * required .ECS.Master_Type type = 1; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type getType() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type getType() { return type_; } // optional .ECS.CheckVersionReq checkversion_req = 2; public static final int CHECKVERSION_REQ_FIELD_NUMBER = 2; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq checkversionReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq checkversionReq_; /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ @@ -10652,19 +10652,19 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq getCheckversionReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq getCheckversionReq() { return checkversionReq_; } /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder() { return checkversionReq_; } // optional .ECS.CheckVersionAns checkversion_ans = 3; public static final int CHECKVERSION_ANS_FIELD_NUMBER = 3; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns checkversionAns_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns checkversionAns_; /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ @@ -10674,19 +10674,19 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns getCheckversionAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns getCheckversionAns() { return checkversionAns_; } /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder() { return checkversionAns_; } // optional .ECS.KeepAliveReq keepalive_req = 4; public static final int KEEPALIVE_REQ_FIELD_NUMBER = 4; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq keepaliveReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq keepaliveReq_; /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ @@ -10696,19 +10696,19 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq getKeepaliveReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq getKeepaliveReq() { return keepaliveReq_; } /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder() { return keepaliveReq_; } // optional .ECS.KeepAliveAns keepalive_ans = 5; public static final int KEEPALIVE_ANS_FIELD_NUMBER = 5; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns keepaliveAns_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns keepaliveAns_; /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ @@ -10718,19 +10718,19 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns getKeepaliveAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns getKeepaliveAns() { return keepaliveAns_; } /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder() { return keepaliveAns_; } // optional .ECS.InjectorReq injector_req = 6; public static final int INJECTOR_REQ_FIELD_NUMBER = 6; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq injectorReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq injectorReq_; /** * optional .ECS.InjectorReq injector_req = 6; */ @@ -10740,19 +10740,19 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq getInjectorReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq getInjectorReq() { return injectorReq_; } /** * optional .ECS.InjectorReq injector_req = 6; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder() { return injectorReq_; } // optional .ECS.InjectorAns injector_ans = 7; public static final int INJECTOR_ANS_FIELD_NUMBER = 7; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns injectorAns_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns injectorAns_; /** * optional .ECS.InjectorAns injector_ans = 7; */ @@ -10762,19 +10762,19 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns getInjectorAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns getInjectorAns() { return injectorAns_; } /** * optional .ECS.InjectorAns injector_ans = 7; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder() { return injectorAns_; } // optional .ECS.InjectorNtf injector_ntf = 8; public static final int INJECTOR_NTF_FIELD_NUMBER = 8; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf injectorNtf_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf injectorNtf_; /** * optional .ECS.InjectorNtf injector_ntf = 8; */ @@ -10784,19 +10784,19 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf getInjectorNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf getInjectorNtf() { return injectorNtf_; } /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder() { return injectorNtf_; } // optional .ECS.DeviceReq device_req = 9; public static final int DEVICE_REQ_FIELD_NUMBER = 9; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq deviceReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq deviceReq_; /** * optional .ECS.DeviceReq device_req = 9; */ @@ -10806,19 +10806,19 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq getDeviceReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq getDeviceReq() { return deviceReq_; } /** * optional .ECS.DeviceReq device_req = 9; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder() { return deviceReq_; } // optional .ECS.DeviceAns device_ans = 10; public static final int DEVICE_ANS_FIELD_NUMBER = 10; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns deviceAns_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns deviceAns_; /** * optional .ECS.DeviceAns device_ans = 10; */ @@ -10828,19 +10828,19 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns getDeviceAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns getDeviceAns() { return deviceAns_; } /** * optional .ECS.DeviceAns device_ans = 10; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder() { return deviceAns_; } // optional .ECS.DeviceNtf device_ntf = 11; public static final int DEVICE_NTF_FIELD_NUMBER = 11; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf deviceNtf_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf deviceNtf_; /** * optional .ECS.DeviceNtf device_ntf = 11; */ @@ -10850,19 +10850,19 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf getDeviceNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf getDeviceNtf() { return deviceNtf_; } /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder() { return deviceNtf_; } // optional .ECS.MonitorReq monitor_req = 12; public static final int MONITOR_REQ_FIELD_NUMBER = 12; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq monitorReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq monitorReq_; /** * optional .ECS.MonitorReq monitor_req = 12; */ @@ -10872,19 +10872,19 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq getMonitorReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq getMonitorReq() { return monitorReq_; } /** * optional .ECS.MonitorReq monitor_req = 12; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder() { return monitorReq_; } // optional .ECS.MonitorAns monitor_ans = 13; public static final int MONITOR_ANS_FIELD_NUMBER = 13; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns monitorAns_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns monitorAns_; /** * optional .ECS.MonitorAns monitor_ans = 13; */ @@ -10894,19 +10894,19 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns getMonitorAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns getMonitorAns() { return monitorAns_; } /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder() { return monitorAns_; } // optional .ECS.MonitorNtf monitor_ntf = 14; public static final int MONITOR_NTF_FIELD_NUMBER = 14; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf monitorNtf_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf monitorNtf_; /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ @@ -10916,19 +10916,19 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf getMonitorNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf getMonitorNtf() { return monitorNtf_; } /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder() { return monitorNtf_; } // optional .ECS.NfcReq nfc_req = 101; public static final int NFC_REQ_FIELD_NUMBER = 101; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq nfcReq_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq nfcReq_; /** * optional .ECS.NfcReq nfc_req = 101; * @@ -10946,7 +10946,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq getNfcReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq getNfcReq() { return nfcReq_; } /** @@ -10956,13 +10956,13 @@ public final class Ecs { * Extensions 101 to 150; * */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder() { return nfcReq_; } // optional .ECS.NfcNtf nfc_ntf = 102; public static final int NFC_NTF_FIELD_NUMBER = 102; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf nfcNtf_; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf nfcNtf_; /** * optional .ECS.NfcNtf nfc_ntf = 102; */ @@ -10972,33 +10972,33 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf getNfcNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf getNfcNtf() { return nfcNtf_; } /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder() { return nfcNtf_; } private void initFields() { - type_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; - checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); - checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); - keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); - keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); - injectorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance(); - injectorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance(); - injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); - deviceReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance(); - deviceAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance(); - deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); - monitorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance(); - monitorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance(); - monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); - nfcReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance(); - nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance(); + type_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; + checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); + checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); + keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); + keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); + injectorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance(); + injectorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance(); + injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); + deviceReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance(); + deviceAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance(); + deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); + monitorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance(); + monitorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance(); + monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); + nfcReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance(); + nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -11227,53 +11227,53 @@ public final class Ecs { return super.writeReplace(); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom(byte[] data) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseDelimitedFrom(java.io.InputStream input) + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseDelimitedFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parseFrom( + public static org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11282,7 +11282,7 @@ public final class Ecs { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master prototype) { + public static Builder newBuilder(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -11298,17 +11298,17 @@ public final class Ecs { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MasterOrBuilder { + implements org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MasterOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_Master_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_Master_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_Master_fieldAccessorTable + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_Master_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.class, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.Builder.class); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.class, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.Builder.class); } // Construct using org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.newBuilder() @@ -11346,94 +11346,94 @@ public final class Ecs { public Builder clear() { super.clear(); - type_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; + type_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; bitField0_ = (bitField0_ & ~0x00000001); if (checkversionReqBuilder_ == null) { - checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); + checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); } else { checkversionReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (checkversionAnsBuilder_ == null) { - checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); + checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); } else { checkversionAnsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); if (keepaliveReqBuilder_ == null) { - keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); + keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); } else { keepaliveReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); if (keepaliveAnsBuilder_ == null) { - keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); + keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); } else { keepaliveAnsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); if (injectorReqBuilder_ == null) { - injectorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance(); + injectorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance(); } else { injectorReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000020); if (injectorAnsBuilder_ == null) { - injectorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance(); + injectorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance(); } else { injectorAnsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000040); if (injectorNtfBuilder_ == null) { - injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); + injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); } else { injectorNtfBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000080); if (deviceReqBuilder_ == null) { - deviceReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance(); + deviceReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance(); } else { deviceReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000100); if (deviceAnsBuilder_ == null) { - deviceAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance(); + deviceAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance(); } else { deviceAnsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000200); if (deviceNtfBuilder_ == null) { - deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); + deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); } else { deviceNtfBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000400); if (monitorReqBuilder_ == null) { - monitorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance(); + monitorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance(); } else { monitorReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000800); if (monitorAnsBuilder_ == null) { - monitorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance(); + monitorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance(); } else { monitorAnsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00001000); if (monitorNtfBuilder_ == null) { - monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); + monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); } else { monitorNtfBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00002000); if (nfcReqBuilder_ == null) { - nfcReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance(); + nfcReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance(); } else { nfcReqBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00004000); if (nfcNtfBuilder_ == null) { - nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance(); + nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance(); } else { nfcNtfBuilder_.clear(); } @@ -11447,23 +11447,23 @@ public final class Ecs { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.internal_static_ECS_Master_descriptor; + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.internal_static_ECS_Master_descriptor; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master getDefaultInstanceForType() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.getDefaultInstance(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master getDefaultInstanceForType() { + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.getDefaultInstance(); } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master build() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master result = buildPartial(); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master build() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master buildPartial() { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master result = new org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master(this); + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master buildPartial() { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master result = new org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -11596,16 +11596,16 @@ public final class Ecs { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master) { - return mergeFrom((org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master)other); + if (other instanceof org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master) { + return mergeFrom((org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master other) { - if (other == org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master.getDefaultInstance()) return this; + public Builder mergeFrom(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master other) { + if (other == org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -11748,11 +11748,11 @@ public final class Ecs { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master parsedMessage = null; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.Master) e.getUnfinishedMessage(); + parsedMessage = (org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -11764,7 +11764,7 @@ public final class Ecs { private int bitField0_; // required .ECS.Master_Type type = 1; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type type_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type type_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; /** * required .ECS.Master_Type type = 1; */ @@ -11774,13 +11774,13 @@ public final class Ecs { /** * required .ECS.Master_Type type = 1; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type getType() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type getType() { return type_; } /** * required .ECS.Master_Type type = 1; */ - public Builder setType(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type value) { + public Builder setType(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type value) { if (value == null) { throw new NullPointerException(); } @@ -11794,15 +11794,15 @@ public final class Ecs { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; + type_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type.CHECKVERSION_REQ; onChanged(); return this; } // optional .ECS.CheckVersionReq checkversion_req = 2; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder> checkversionReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder> checkversionReqBuilder_; /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ @@ -11812,7 +11812,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq getCheckversionReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq getCheckversionReq() { if (checkversionReqBuilder_ == null) { return checkversionReq_; } else { @@ -11822,7 +11822,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public Builder setCheckversionReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq value) { + public Builder setCheckversionReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq value) { if (checkversionReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11839,7 +11839,7 @@ public final class Ecs { * optional .ECS.CheckVersionReq checkversion_req = 2; */ public Builder setCheckversionReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder builderForValue) { if (checkversionReqBuilder_ == null) { checkversionReq_ = builderForValue.build(); onChanged(); @@ -11852,12 +11852,12 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public Builder mergeCheckversionReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq value) { + public Builder mergeCheckversionReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq value) { if (checkversionReqBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - checkversionReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance()) { + checkversionReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance()) { checkversionReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.newBuilder(checkversionReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.newBuilder(checkversionReq_).mergeFrom(value).buildPartial(); } else { checkversionReq_ = value; } @@ -11873,7 +11873,7 @@ public final class Ecs { */ public Builder clearCheckversionReq() { if (checkversionReqBuilder_ == null) { - checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); + checkversionReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.getDefaultInstance(); onChanged(); } else { checkversionReqBuilder_.clear(); @@ -11884,7 +11884,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder getCheckversionReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder getCheckversionReqBuilder() { bitField0_ |= 0x00000002; onChanged(); return getCheckversionReqFieldBuilder().getBuilder(); @@ -11892,7 +11892,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionReq checkversion_req = 2; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder getCheckversionReqOrBuilder() { if (checkversionReqBuilder_ != null) { return checkversionReqBuilder_.getMessageOrBuilder(); } else { @@ -11903,11 +11903,11 @@ public final class Ecs { * optional .ECS.CheckVersionReq checkversion_req = 2; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder> getCheckversionReqFieldBuilder() { if (checkversionReqBuilder_ == null) { checkversionReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionReqOrBuilder>( checkversionReq_, getParentForChildren(), isClean()); @@ -11917,9 +11917,9 @@ public final class Ecs { } // optional .ECS.CheckVersionAns checkversion_ans = 3; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder> checkversionAnsBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder> checkversionAnsBuilder_; /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ @@ -11929,7 +11929,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns getCheckversionAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns getCheckversionAns() { if (checkversionAnsBuilder_ == null) { return checkversionAns_; } else { @@ -11939,7 +11939,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public Builder setCheckversionAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns value) { + public Builder setCheckversionAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns value) { if (checkversionAnsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11956,7 +11956,7 @@ public final class Ecs { * optional .ECS.CheckVersionAns checkversion_ans = 3; */ public Builder setCheckversionAns( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder builderForValue) { if (checkversionAnsBuilder_ == null) { checkversionAns_ = builderForValue.build(); onChanged(); @@ -11969,12 +11969,12 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public Builder mergeCheckversionAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns value) { + public Builder mergeCheckversionAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns value) { if (checkversionAnsBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - checkversionAns_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance()) { + checkversionAns_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance()) { checkversionAns_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.newBuilder(checkversionAns_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.newBuilder(checkversionAns_).mergeFrom(value).buildPartial(); } else { checkversionAns_ = value; } @@ -11990,7 +11990,7 @@ public final class Ecs { */ public Builder clearCheckversionAns() { if (checkversionAnsBuilder_ == null) { - checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); + checkversionAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.getDefaultInstance(); onChanged(); } else { checkversionAnsBuilder_.clear(); @@ -12001,7 +12001,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder getCheckversionAnsBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder getCheckversionAnsBuilder() { bitField0_ |= 0x00000004; onChanged(); return getCheckversionAnsFieldBuilder().getBuilder(); @@ -12009,7 +12009,7 @@ public final class Ecs { /** * optional .ECS.CheckVersionAns checkversion_ans = 3; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder getCheckversionAnsOrBuilder() { if (checkversionAnsBuilder_ != null) { return checkversionAnsBuilder_.getMessageOrBuilder(); } else { @@ -12020,11 +12020,11 @@ public final class Ecs { * optional .ECS.CheckVersionAns checkversion_ans = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder> getCheckversionAnsFieldBuilder() { if (checkversionAnsBuilder_ == null) { checkversionAnsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.CheckVersionAnsOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.CheckVersionAnsOrBuilder>( checkversionAns_, getParentForChildren(), isClean()); @@ -12034,9 +12034,9 @@ public final class Ecs { } // optional .ECS.KeepAliveReq keepalive_req = 4; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder> keepaliveReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder> keepaliveReqBuilder_; /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ @@ -12046,7 +12046,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq getKeepaliveReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq getKeepaliveReq() { if (keepaliveReqBuilder_ == null) { return keepaliveReq_; } else { @@ -12056,7 +12056,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public Builder setKeepaliveReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq value) { + public Builder setKeepaliveReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq value) { if (keepaliveReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12073,7 +12073,7 @@ public final class Ecs { * optional .ECS.KeepAliveReq keepalive_req = 4; */ public Builder setKeepaliveReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder builderForValue) { if (keepaliveReqBuilder_ == null) { keepaliveReq_ = builderForValue.build(); onChanged(); @@ -12086,12 +12086,12 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public Builder mergeKeepaliveReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq value) { + public Builder mergeKeepaliveReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq value) { if (keepaliveReqBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - keepaliveReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance()) { + keepaliveReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance()) { keepaliveReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.newBuilder(keepaliveReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.newBuilder(keepaliveReq_).mergeFrom(value).buildPartial(); } else { keepaliveReq_ = value; } @@ -12107,7 +12107,7 @@ public final class Ecs { */ public Builder clearKeepaliveReq() { if (keepaliveReqBuilder_ == null) { - keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); + keepaliveReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.getDefaultInstance(); onChanged(); } else { keepaliveReqBuilder_.clear(); @@ -12118,7 +12118,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder getKeepaliveReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder getKeepaliveReqBuilder() { bitField0_ |= 0x00000008; onChanged(); return getKeepaliveReqFieldBuilder().getBuilder(); @@ -12126,7 +12126,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveReq keepalive_req = 4; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder getKeepaliveReqOrBuilder() { if (keepaliveReqBuilder_ != null) { return keepaliveReqBuilder_.getMessageOrBuilder(); } else { @@ -12137,11 +12137,11 @@ public final class Ecs { * optional .ECS.KeepAliveReq keepalive_req = 4; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder> getKeepaliveReqFieldBuilder() { if (keepaliveReqBuilder_ == null) { keepaliveReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveReqOrBuilder>( keepaliveReq_, getParentForChildren(), isClean()); @@ -12151,9 +12151,9 @@ public final class Ecs { } // optional .ECS.KeepAliveAns keepalive_ans = 5; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder> keepaliveAnsBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder> keepaliveAnsBuilder_; /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ @@ -12163,7 +12163,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns getKeepaliveAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns getKeepaliveAns() { if (keepaliveAnsBuilder_ == null) { return keepaliveAns_; } else { @@ -12173,7 +12173,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public Builder setKeepaliveAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns value) { + public Builder setKeepaliveAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns value) { if (keepaliveAnsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12190,7 +12190,7 @@ public final class Ecs { * optional .ECS.KeepAliveAns keepalive_ans = 5; */ public Builder setKeepaliveAns( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder builderForValue) { if (keepaliveAnsBuilder_ == null) { keepaliveAns_ = builderForValue.build(); onChanged(); @@ -12203,12 +12203,12 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public Builder mergeKeepaliveAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns value) { + public Builder mergeKeepaliveAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns value) { if (keepaliveAnsBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - keepaliveAns_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance()) { + keepaliveAns_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance()) { keepaliveAns_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.newBuilder(keepaliveAns_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.newBuilder(keepaliveAns_).mergeFrom(value).buildPartial(); } else { keepaliveAns_ = value; } @@ -12224,7 +12224,7 @@ public final class Ecs { */ public Builder clearKeepaliveAns() { if (keepaliveAnsBuilder_ == null) { - keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); + keepaliveAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.getDefaultInstance(); onChanged(); } else { keepaliveAnsBuilder_.clear(); @@ -12235,7 +12235,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder getKeepaliveAnsBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder getKeepaliveAnsBuilder() { bitField0_ |= 0x00000010; onChanged(); return getKeepaliveAnsFieldBuilder().getBuilder(); @@ -12243,7 +12243,7 @@ public final class Ecs { /** * optional .ECS.KeepAliveAns keepalive_ans = 5; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder getKeepaliveAnsOrBuilder() { if (keepaliveAnsBuilder_ != null) { return keepaliveAnsBuilder_.getMessageOrBuilder(); } else { @@ -12254,11 +12254,11 @@ public final class Ecs { * optional .ECS.KeepAliveAns keepalive_ans = 5; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder> getKeepaliveAnsFieldBuilder() { if (keepaliveAnsBuilder_ == null) { keepaliveAnsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.KeepAliveAnsOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAnsOrBuilder>( keepaliveAns_, getParentForChildren(), isClean()); @@ -12268,9 +12268,9 @@ public final class Ecs { } // optional .ECS.InjectorReq injector_req = 6; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq injectorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq injectorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder> injectorReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder> injectorReqBuilder_; /** * optional .ECS.InjectorReq injector_req = 6; */ @@ -12280,7 +12280,7 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq getInjectorReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq getInjectorReq() { if (injectorReqBuilder_ == null) { return injectorReq_; } else { @@ -12290,7 +12290,7 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public Builder setInjectorReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq value) { + public Builder setInjectorReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq value) { if (injectorReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12307,7 +12307,7 @@ public final class Ecs { * optional .ECS.InjectorReq injector_req = 6; */ public Builder setInjectorReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder builderForValue) { if (injectorReqBuilder_ == null) { injectorReq_ = builderForValue.build(); onChanged(); @@ -12320,12 +12320,12 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public Builder mergeInjectorReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq value) { + public Builder mergeInjectorReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq value) { if (injectorReqBuilder_ == null) { if (((bitField0_ & 0x00000020) == 0x00000020) && - injectorReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance()) { + injectorReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance()) { injectorReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.newBuilder(injectorReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.newBuilder(injectorReq_).mergeFrom(value).buildPartial(); } else { injectorReq_ = value; } @@ -12341,7 +12341,7 @@ public final class Ecs { */ public Builder clearInjectorReq() { if (injectorReqBuilder_ == null) { - injectorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.getDefaultInstance(); + injectorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.getDefaultInstance(); onChanged(); } else { injectorReqBuilder_.clear(); @@ -12352,7 +12352,7 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder getInjectorReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder getInjectorReqBuilder() { bitField0_ |= 0x00000020; onChanged(); return getInjectorReqFieldBuilder().getBuilder(); @@ -12360,7 +12360,7 @@ public final class Ecs { /** * optional .ECS.InjectorReq injector_req = 6; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder getInjectorReqOrBuilder() { if (injectorReqBuilder_ != null) { return injectorReqBuilder_.getMessageOrBuilder(); } else { @@ -12371,11 +12371,11 @@ public final class Ecs { * optional .ECS.InjectorReq injector_req = 6; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder> getInjectorReqFieldBuilder() { if (injectorReqBuilder_ == null) { injectorReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorReqOrBuilder>( injectorReq_, getParentForChildren(), isClean()); @@ -12385,9 +12385,9 @@ public final class Ecs { } // optional .ECS.InjectorAns injector_ans = 7; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns injectorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns injectorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder> injectorAnsBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder> injectorAnsBuilder_; /** * optional .ECS.InjectorAns injector_ans = 7; */ @@ -12397,7 +12397,7 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns getInjectorAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns getInjectorAns() { if (injectorAnsBuilder_ == null) { return injectorAns_; } else { @@ -12407,7 +12407,7 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public Builder setInjectorAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns value) { + public Builder setInjectorAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns value) { if (injectorAnsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12424,7 +12424,7 @@ public final class Ecs { * optional .ECS.InjectorAns injector_ans = 7; */ public Builder setInjectorAns( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder builderForValue) { if (injectorAnsBuilder_ == null) { injectorAns_ = builderForValue.build(); onChanged(); @@ -12437,12 +12437,12 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public Builder mergeInjectorAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns value) { + public Builder mergeInjectorAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns value) { if (injectorAnsBuilder_ == null) { if (((bitField0_ & 0x00000040) == 0x00000040) && - injectorAns_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance()) { + injectorAns_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance()) { injectorAns_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.newBuilder(injectorAns_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.newBuilder(injectorAns_).mergeFrom(value).buildPartial(); } else { injectorAns_ = value; } @@ -12458,7 +12458,7 @@ public final class Ecs { */ public Builder clearInjectorAns() { if (injectorAnsBuilder_ == null) { - injectorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.getDefaultInstance(); + injectorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.getDefaultInstance(); onChanged(); } else { injectorAnsBuilder_.clear(); @@ -12469,7 +12469,7 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder getInjectorAnsBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder getInjectorAnsBuilder() { bitField0_ |= 0x00000040; onChanged(); return getInjectorAnsFieldBuilder().getBuilder(); @@ -12477,7 +12477,7 @@ public final class Ecs { /** * optional .ECS.InjectorAns injector_ans = 7; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder getInjectorAnsOrBuilder() { if (injectorAnsBuilder_ != null) { return injectorAnsBuilder_.getMessageOrBuilder(); } else { @@ -12488,11 +12488,11 @@ public final class Ecs { * optional .ECS.InjectorAns injector_ans = 7; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder> getInjectorAnsFieldBuilder() { if (injectorAnsBuilder_ == null) { injectorAnsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorAnsOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorAnsOrBuilder>( injectorAns_, getParentForChildren(), isClean()); @@ -12502,9 +12502,9 @@ public final class Ecs { } // optional .ECS.InjectorNtf injector_ntf = 8; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder> injectorNtfBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder> injectorNtfBuilder_; /** * optional .ECS.InjectorNtf injector_ntf = 8; */ @@ -12514,7 +12514,7 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf getInjectorNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf getInjectorNtf() { if (injectorNtfBuilder_ == null) { return injectorNtf_; } else { @@ -12524,7 +12524,7 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public Builder setInjectorNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf value) { + public Builder setInjectorNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf value) { if (injectorNtfBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12541,7 +12541,7 @@ public final class Ecs { * optional .ECS.InjectorNtf injector_ntf = 8; */ public Builder setInjectorNtf( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder builderForValue) { if (injectorNtfBuilder_ == null) { injectorNtf_ = builderForValue.build(); onChanged(); @@ -12554,12 +12554,12 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public Builder mergeInjectorNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf value) { + public Builder mergeInjectorNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf value) { if (injectorNtfBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - injectorNtf_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance()) { + injectorNtf_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance()) { injectorNtf_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.newBuilder(injectorNtf_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.newBuilder(injectorNtf_).mergeFrom(value).buildPartial(); } else { injectorNtf_ = value; } @@ -12575,7 +12575,7 @@ public final class Ecs { */ public Builder clearInjectorNtf() { if (injectorNtfBuilder_ == null) { - injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); + injectorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.getDefaultInstance(); onChanged(); } else { injectorNtfBuilder_.clear(); @@ -12586,7 +12586,7 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder getInjectorNtfBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder getInjectorNtfBuilder() { bitField0_ |= 0x00000080; onChanged(); return getInjectorNtfFieldBuilder().getBuilder(); @@ -12594,7 +12594,7 @@ public final class Ecs { /** * optional .ECS.InjectorNtf injector_ntf = 8; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder getInjectorNtfOrBuilder() { if (injectorNtfBuilder_ != null) { return injectorNtfBuilder_.getMessageOrBuilder(); } else { @@ -12605,11 +12605,11 @@ public final class Ecs { * optional .ECS.InjectorNtf injector_ntf = 8; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder> getInjectorNtfFieldBuilder() { if (injectorNtfBuilder_ == null) { injectorNtfBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.InjectorNtfOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.InjectorNtfOrBuilder>( injectorNtf_, getParentForChildren(), isClean()); @@ -12619,9 +12619,9 @@ public final class Ecs { } // optional .ECS.DeviceReq device_req = 9; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq deviceReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq deviceReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder> deviceReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder> deviceReqBuilder_; /** * optional .ECS.DeviceReq device_req = 9; */ @@ -12631,7 +12631,7 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq getDeviceReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq getDeviceReq() { if (deviceReqBuilder_ == null) { return deviceReq_; } else { @@ -12641,7 +12641,7 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public Builder setDeviceReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq value) { + public Builder setDeviceReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq value) { if (deviceReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12658,7 +12658,7 @@ public final class Ecs { * optional .ECS.DeviceReq device_req = 9; */ public Builder setDeviceReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder builderForValue) { if (deviceReqBuilder_ == null) { deviceReq_ = builderForValue.build(); onChanged(); @@ -12671,12 +12671,12 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public Builder mergeDeviceReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq value) { + public Builder mergeDeviceReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq value) { if (deviceReqBuilder_ == null) { if (((bitField0_ & 0x00000100) == 0x00000100) && - deviceReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance()) { + deviceReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance()) { deviceReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.newBuilder(deviceReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.newBuilder(deviceReq_).mergeFrom(value).buildPartial(); } else { deviceReq_ = value; } @@ -12692,7 +12692,7 @@ public final class Ecs { */ public Builder clearDeviceReq() { if (deviceReqBuilder_ == null) { - deviceReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.getDefaultInstance(); + deviceReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.getDefaultInstance(); onChanged(); } else { deviceReqBuilder_.clear(); @@ -12703,7 +12703,7 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder getDeviceReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder getDeviceReqBuilder() { bitField0_ |= 0x00000100; onChanged(); return getDeviceReqFieldBuilder().getBuilder(); @@ -12711,7 +12711,7 @@ public final class Ecs { /** * optional .ECS.DeviceReq device_req = 9; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder getDeviceReqOrBuilder() { if (deviceReqBuilder_ != null) { return deviceReqBuilder_.getMessageOrBuilder(); } else { @@ -12722,11 +12722,11 @@ public final class Ecs { * optional .ECS.DeviceReq device_req = 9; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder> getDeviceReqFieldBuilder() { if (deviceReqBuilder_ == null) { deviceReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceReqOrBuilder>( deviceReq_, getParentForChildren(), isClean()); @@ -12736,9 +12736,9 @@ public final class Ecs { } // optional .ECS.DeviceAns device_ans = 10; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns deviceAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns deviceAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder> deviceAnsBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder> deviceAnsBuilder_; /** * optional .ECS.DeviceAns device_ans = 10; */ @@ -12748,7 +12748,7 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns getDeviceAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns getDeviceAns() { if (deviceAnsBuilder_ == null) { return deviceAns_; } else { @@ -12758,7 +12758,7 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public Builder setDeviceAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns value) { + public Builder setDeviceAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns value) { if (deviceAnsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12775,7 +12775,7 @@ public final class Ecs { * optional .ECS.DeviceAns device_ans = 10; */ public Builder setDeviceAns( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder builderForValue) { if (deviceAnsBuilder_ == null) { deviceAns_ = builderForValue.build(); onChanged(); @@ -12788,12 +12788,12 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public Builder mergeDeviceAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns value) { + public Builder mergeDeviceAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns value) { if (deviceAnsBuilder_ == null) { if (((bitField0_ & 0x00000200) == 0x00000200) && - deviceAns_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance()) { + deviceAns_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance()) { deviceAns_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.newBuilder(deviceAns_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.newBuilder(deviceAns_).mergeFrom(value).buildPartial(); } else { deviceAns_ = value; } @@ -12809,7 +12809,7 @@ public final class Ecs { */ public Builder clearDeviceAns() { if (deviceAnsBuilder_ == null) { - deviceAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.getDefaultInstance(); + deviceAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.getDefaultInstance(); onChanged(); } else { deviceAnsBuilder_.clear(); @@ -12820,7 +12820,7 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder getDeviceAnsBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder getDeviceAnsBuilder() { bitField0_ |= 0x00000200; onChanged(); return getDeviceAnsFieldBuilder().getBuilder(); @@ -12828,7 +12828,7 @@ public final class Ecs { /** * optional .ECS.DeviceAns device_ans = 10; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder getDeviceAnsOrBuilder() { if (deviceAnsBuilder_ != null) { return deviceAnsBuilder_.getMessageOrBuilder(); } else { @@ -12839,11 +12839,11 @@ public final class Ecs { * optional .ECS.DeviceAns device_ans = 10; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder> getDeviceAnsFieldBuilder() { if (deviceAnsBuilder_ == null) { deviceAnsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceAnsOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceAnsOrBuilder>( deviceAns_, getParentForChildren(), isClean()); @@ -12853,9 +12853,9 @@ public final class Ecs { } // optional .ECS.DeviceNtf device_ntf = 11; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder> deviceNtfBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder> deviceNtfBuilder_; /** * optional .ECS.DeviceNtf device_ntf = 11; */ @@ -12865,7 +12865,7 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf getDeviceNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf getDeviceNtf() { if (deviceNtfBuilder_ == null) { return deviceNtf_; } else { @@ -12875,7 +12875,7 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public Builder setDeviceNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf value) { + public Builder setDeviceNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf value) { if (deviceNtfBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12892,7 +12892,7 @@ public final class Ecs { * optional .ECS.DeviceNtf device_ntf = 11; */ public Builder setDeviceNtf( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder builderForValue) { if (deviceNtfBuilder_ == null) { deviceNtf_ = builderForValue.build(); onChanged(); @@ -12905,12 +12905,12 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public Builder mergeDeviceNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf value) { + public Builder mergeDeviceNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf value) { if (deviceNtfBuilder_ == null) { if (((bitField0_ & 0x00000400) == 0x00000400) && - deviceNtf_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance()) { + deviceNtf_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance()) { deviceNtf_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.newBuilder(deviceNtf_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.newBuilder(deviceNtf_).mergeFrom(value).buildPartial(); } else { deviceNtf_ = value; } @@ -12926,7 +12926,7 @@ public final class Ecs { */ public Builder clearDeviceNtf() { if (deviceNtfBuilder_ == null) { - deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); + deviceNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.getDefaultInstance(); onChanged(); } else { deviceNtfBuilder_.clear(); @@ -12937,7 +12937,7 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder getDeviceNtfBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder getDeviceNtfBuilder() { bitField0_ |= 0x00000400; onChanged(); return getDeviceNtfFieldBuilder().getBuilder(); @@ -12945,7 +12945,7 @@ public final class Ecs { /** * optional .ECS.DeviceNtf device_ntf = 11; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder getDeviceNtfOrBuilder() { if (deviceNtfBuilder_ != null) { return deviceNtfBuilder_.getMessageOrBuilder(); } else { @@ -12956,11 +12956,11 @@ public final class Ecs { * optional .ECS.DeviceNtf device_ntf = 11; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder> getDeviceNtfFieldBuilder() { if (deviceNtfBuilder_ == null) { deviceNtfBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.DeviceNtfOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.DeviceNtfOrBuilder>( deviceNtf_, getParentForChildren(), isClean()); @@ -12970,9 +12970,9 @@ public final class Ecs { } // optional .ECS.MonitorReq monitor_req = 12; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq monitorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq monitorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder> monitorReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder> monitorReqBuilder_; /** * optional .ECS.MonitorReq monitor_req = 12; */ @@ -12982,7 +12982,7 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq getMonitorReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq getMonitorReq() { if (monitorReqBuilder_ == null) { return monitorReq_; } else { @@ -12992,7 +12992,7 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public Builder setMonitorReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq value) { + public Builder setMonitorReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq value) { if (monitorReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13009,7 +13009,7 @@ public final class Ecs { * optional .ECS.MonitorReq monitor_req = 12; */ public Builder setMonitorReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder builderForValue) { if (monitorReqBuilder_ == null) { monitorReq_ = builderForValue.build(); onChanged(); @@ -13022,12 +13022,12 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public Builder mergeMonitorReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq value) { + public Builder mergeMonitorReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq value) { if (monitorReqBuilder_ == null) { if (((bitField0_ & 0x00000800) == 0x00000800) && - monitorReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance()) { + monitorReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance()) { monitorReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.newBuilder(monitorReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.newBuilder(monitorReq_).mergeFrom(value).buildPartial(); } else { monitorReq_ = value; } @@ -13043,7 +13043,7 @@ public final class Ecs { */ public Builder clearMonitorReq() { if (monitorReqBuilder_ == null) { - monitorReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.getDefaultInstance(); + monitorReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.getDefaultInstance(); onChanged(); } else { monitorReqBuilder_.clear(); @@ -13054,7 +13054,7 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder getMonitorReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder getMonitorReqBuilder() { bitField0_ |= 0x00000800; onChanged(); return getMonitorReqFieldBuilder().getBuilder(); @@ -13062,7 +13062,7 @@ public final class Ecs { /** * optional .ECS.MonitorReq monitor_req = 12; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder getMonitorReqOrBuilder() { if (monitorReqBuilder_ != null) { return monitorReqBuilder_.getMessageOrBuilder(); } else { @@ -13073,11 +13073,11 @@ public final class Ecs { * optional .ECS.MonitorReq monitor_req = 12; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder> getMonitorReqFieldBuilder() { if (monitorReqBuilder_ == null) { monitorReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReqOrBuilder>( monitorReq_, getParentForChildren(), isClean()); @@ -13087,9 +13087,9 @@ public final class Ecs { } // optional .ECS.MonitorAns monitor_ans = 13; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns monitorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns monitorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder> monitorAnsBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder> monitorAnsBuilder_; /** * optional .ECS.MonitorAns monitor_ans = 13; */ @@ -13099,7 +13099,7 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns getMonitorAns() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns getMonitorAns() { if (monitorAnsBuilder_ == null) { return monitorAns_; } else { @@ -13109,7 +13109,7 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public Builder setMonitorAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns value) { + public Builder setMonitorAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns value) { if (monitorAnsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13126,7 +13126,7 @@ public final class Ecs { * optional .ECS.MonitorAns monitor_ans = 13; */ public Builder setMonitorAns( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder builderForValue) { if (monitorAnsBuilder_ == null) { monitorAns_ = builderForValue.build(); onChanged(); @@ -13139,12 +13139,12 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public Builder mergeMonitorAns(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns value) { + public Builder mergeMonitorAns(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns value) { if (monitorAnsBuilder_ == null) { if (((bitField0_ & 0x00001000) == 0x00001000) && - monitorAns_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance()) { + monitorAns_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance()) { monitorAns_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.newBuilder(monitorAns_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.newBuilder(monitorAns_).mergeFrom(value).buildPartial(); } else { monitorAns_ = value; } @@ -13160,7 +13160,7 @@ public final class Ecs { */ public Builder clearMonitorAns() { if (monitorAnsBuilder_ == null) { - monitorAns_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.getDefaultInstance(); + monitorAns_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.getDefaultInstance(); onChanged(); } else { monitorAnsBuilder_.clear(); @@ -13171,7 +13171,7 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder getMonitorAnsBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder getMonitorAnsBuilder() { bitField0_ |= 0x00001000; onChanged(); return getMonitorAnsFieldBuilder().getBuilder(); @@ -13179,7 +13179,7 @@ public final class Ecs { /** * optional .ECS.MonitorAns monitor_ans = 13; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder getMonitorAnsOrBuilder() { if (monitorAnsBuilder_ != null) { return monitorAnsBuilder_.getMessageOrBuilder(); } else { @@ -13190,11 +13190,11 @@ public final class Ecs { * optional .ECS.MonitorAns monitor_ans = 13; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder> getMonitorAnsFieldBuilder() { if (monitorAnsBuilder_ == null) { monitorAnsBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorAnsOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAns.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorAnsOrBuilder>( monitorAns_, getParentForChildren(), isClean()); @@ -13204,9 +13204,9 @@ public final class Ecs { } // optional .ECS.MonitorNtf monitor_ntf = 14; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder> monitorNtfBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder> monitorNtfBuilder_; /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ @@ -13216,7 +13216,7 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf getMonitorNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf getMonitorNtf() { if (monitorNtfBuilder_ == null) { return monitorNtf_; } else { @@ -13226,7 +13226,7 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public Builder setMonitorNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf value) { + public Builder setMonitorNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf value) { if (monitorNtfBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13243,7 +13243,7 @@ public final class Ecs { * optional .ECS.MonitorNtf monitor_ntf = 14; */ public Builder setMonitorNtf( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder builderForValue) { if (monitorNtfBuilder_ == null) { monitorNtf_ = builderForValue.build(); onChanged(); @@ -13256,12 +13256,12 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public Builder mergeMonitorNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf value) { + public Builder mergeMonitorNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf value) { if (monitorNtfBuilder_ == null) { if (((bitField0_ & 0x00002000) == 0x00002000) && - monitorNtf_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance()) { + monitorNtf_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance()) { monitorNtf_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.newBuilder(monitorNtf_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.newBuilder(monitorNtf_).mergeFrom(value).buildPartial(); } else { monitorNtf_ = value; } @@ -13277,7 +13277,7 @@ public final class Ecs { */ public Builder clearMonitorNtf() { if (monitorNtfBuilder_ == null) { - monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); + monitorNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.getDefaultInstance(); onChanged(); } else { monitorNtfBuilder_.clear(); @@ -13288,7 +13288,7 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder getMonitorNtfBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder getMonitorNtfBuilder() { bitField0_ |= 0x00002000; onChanged(); return getMonitorNtfFieldBuilder().getBuilder(); @@ -13296,7 +13296,7 @@ public final class Ecs { /** * optional .ECS.MonitorNtf monitor_ntf = 14; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder getMonitorNtfOrBuilder() { if (monitorNtfBuilder_ != null) { return monitorNtfBuilder_.getMessageOrBuilder(); } else { @@ -13307,11 +13307,11 @@ public final class Ecs { * optional .ECS.MonitorNtf monitor_ntf = 14; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder> getMonitorNtfFieldBuilder() { if (monitorNtfBuilder_ == null) { monitorNtfBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.MonitorNtfOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorNtfOrBuilder>( monitorNtf_, getParentForChildren(), isClean()); @@ -13321,9 +13321,9 @@ public final class Ecs { } // optional .ECS.NfcReq nfc_req = 101; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq nfcReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq nfcReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder> nfcReqBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder> nfcReqBuilder_; /** * optional .ECS.NfcReq nfc_req = 101; * @@ -13341,7 +13341,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq getNfcReq() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq getNfcReq() { if (nfcReqBuilder_ == null) { return nfcReq_; } else { @@ -13355,7 +13355,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - public Builder setNfcReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq value) { + public Builder setNfcReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq value) { if (nfcReqBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13376,7 +13376,7 @@ public final class Ecs { * */ public Builder setNfcReq( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder builderForValue) { if (nfcReqBuilder_ == null) { nfcReq_ = builderForValue.build(); onChanged(); @@ -13393,12 +13393,12 @@ public final class Ecs { * Extensions 101 to 150; * */ - public Builder mergeNfcReq(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq value) { + public Builder mergeNfcReq(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq value) { if (nfcReqBuilder_ == null) { if (((bitField0_ & 0x00004000) == 0x00004000) && - nfcReq_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance()) { + nfcReq_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance()) { nfcReq_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.newBuilder(nfcReq_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.newBuilder(nfcReq_).mergeFrom(value).buildPartial(); } else { nfcReq_ = value; } @@ -13418,7 +13418,7 @@ public final class Ecs { */ public Builder clearNfcReq() { if (nfcReqBuilder_ == null) { - nfcReq_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.getDefaultInstance(); + nfcReq_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.getDefaultInstance(); onChanged(); } else { nfcReqBuilder_.clear(); @@ -13433,7 +13433,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder getNfcReqBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder getNfcReqBuilder() { bitField0_ |= 0x00004000; onChanged(); return getNfcReqFieldBuilder().getBuilder(); @@ -13445,7 +13445,7 @@ public final class Ecs { * Extensions 101 to 150; * */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder getNfcReqOrBuilder() { if (nfcReqBuilder_ != null) { return nfcReqBuilder_.getMessageOrBuilder(); } else { @@ -13460,11 +13460,11 @@ public final class Ecs { * */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder> getNfcReqFieldBuilder() { if (nfcReqBuilder_ == null) { nfcReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcReqOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReq.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcReqOrBuilder>( nfcReq_, getParentForChildren(), isClean()); @@ -13474,9 +13474,9 @@ public final class Ecs { } // optional .ECS.NfcNtf nfc_ntf = 102; - private org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance(); + private org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder> nfcNtfBuilder_; + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder> nfcNtfBuilder_; /** * optional .ECS.NfcNtf nfc_ntf = 102; */ @@ -13486,7 +13486,7 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf getNfcNtf() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf getNfcNtf() { if (nfcNtfBuilder_ == null) { return nfcNtf_; } else { @@ -13496,7 +13496,7 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public Builder setNfcNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf value) { + public Builder setNfcNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf value) { if (nfcNtfBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13513,7 +13513,7 @@ public final class Ecs { * optional .ECS.NfcNtf nfc_ntf = 102; */ public Builder setNfcNtf( - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder builderForValue) { + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder builderForValue) { if (nfcNtfBuilder_ == null) { nfcNtf_ = builderForValue.build(); onChanged(); @@ -13526,12 +13526,12 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public Builder mergeNfcNtf(org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf value) { + public Builder mergeNfcNtf(org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf value) { if (nfcNtfBuilder_ == null) { if (((bitField0_ & 0x00008000) == 0x00008000) && - nfcNtf_ != org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance()) { + nfcNtf_ != org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance()) { nfcNtf_ = - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.newBuilder(nfcNtf_).mergeFrom(value).buildPartial(); + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.newBuilder(nfcNtf_).mergeFrom(value).buildPartial(); } else { nfcNtf_ = value; } @@ -13547,7 +13547,7 @@ public final class Ecs { */ public Builder clearNfcNtf() { if (nfcNtfBuilder_ == null) { - nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.getDefaultInstance(); + nfcNtf_ = org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.getDefaultInstance(); onChanged(); } else { nfcNtfBuilder_.clear(); @@ -13558,7 +13558,7 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder getNfcNtfBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder getNfcNtfBuilder() { bitField0_ |= 0x00008000; onChanged(); return getNfcNtfFieldBuilder().getBuilder(); @@ -13566,7 +13566,7 @@ public final class Ecs { /** * optional .ECS.NfcNtf nfc_ntf = 102; */ - public org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder() { + public org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder getNfcNtfOrBuilder() { if (nfcNtfBuilder_ != null) { return nfcNtfBuilder_.getMessageOrBuilder(); } else { @@ -13577,11 +13577,11 @@ public final class Ecs { * optional .ECS.NfcNtf nfc_ntf = 102; */ private com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder> + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder> getNfcNtfFieldBuilder() { if (nfcNtfBuilder_ == null) { nfcNtfBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.Ecs.NfcNtfOrBuilder>( + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtf.Builder, org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.NfcNtfOrBuilder>( nfcNtf_, getParentForChildren(), isClean()); @@ -13731,7 +13731,7 @@ public final class Ecs { "rAns\022$\n\013monitor_ntf\030\016 \001(\0132\017.ECS.MonitorN" + "tf\022\034\n\007nfc_req\030e \001(\0132\013.ECS.NfcReq\022\034\n\007nfc_", "ntf\030f \001(\0132\013.ECS.NfcNtfB0\n.org.tizen.dyna" + - "micanalyzer.ui.info.snapshot.ecs" + "micanalyzer.ui.info.screenshot.ecs" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -13840,7 +13840,7 @@ public final class Ecs { com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.getDescriptor(), + org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.getDescriptor(), }, assigner); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/EcsIds.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/EcsIds.java similarity index 97% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/EcsIds.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/EcsIds.java index 5dfd1c1..937a75f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/ecs/EcsIds.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ecs/EcsIds.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ecs_ids.proto -package org.tizen.dynamicanalyzer.ui.info.snapshot.ecs; +package org.tizen.dynamicanalyzer.ui.info.screenshot.ecs; public final class EcsIds { private EcsIds() {} @@ -182,7 +182,7 @@ public final class EcsIds { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.tizen.dynamicanalyzer.ui.info.snapshot.ecs.EcsIds.getDescriptor().getEnumTypes().get(0); + return org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.getDescriptor().getEnumTypes().get(0); } private static final Master_Type[] VALUES = values(); @@ -224,7 +224,7 @@ public final class EcsIds { "NS\020\n\022\016\n\nDEVICE_NTF\020\013\022\017\n\013MONITOR_REQ\020\014\022\017\n" + "\013MONITOR_ANS\020\r\022\017\n\013MONITOR_NTF\020\016\022\013\n\007NFC_R" + "EQ\020e\022\013\n\007NFC_NTF\020fB0\n.org.tizen.dynamican" + - "alyzer.ui.info.snapshot.ecs" + "alyzer.ui.info.screenshot.ecs" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java index e857cb1..73ef4fc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java @@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -47,18 +46,17 @@ import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardSelectionListener; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class CallFlowChartView extends DAView { - public static final String ID = CallFlowChartView.class.getName(); - +public class CallFlowChartView extends DAViewComposite { private final Composite contents; private CallFlowChart callflowChart; private DACustomCombo callflowCombo; @@ -68,14 +66,12 @@ public class CallFlowChartView extends DAView { .getInstance(); public CallFlowChartView(Composite parent, int style) { - super(parent, style); - name = KernelPageLabels.CALL_FLOW_CHART_TITLE; + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(KernelPageLabels.CALL_FLOW_CHART_TITLE); + setTitle(KernelPageLabels.CALL_FLOW_CHART_TITLE); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); contents.setLayout(stackLayout); @@ -88,9 +84,9 @@ public class CallFlowChartView extends DAView { public void handleSelectionEvent(DAChartBoardItem item) { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - CallFlowChartView.ID, + KernelPage.callflowViewID, (long) (((DAChartPlotIntervalMarker) callflowChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -169,28 +165,33 @@ public class CallFlowChartView extends DAView { } @Override - public void updateView(DASelectionData selData) { - Object odata = selData.getData(); - long selectionStartTime, selectionEndTime; - - if (!(odata instanceof KernelSelectionData)) { - selectionStartTime = selData.getStartTime(); - selectionEndTime = selData.getEndTime(); - - double startTime = (double) selectionStartTime - / TimelineConstants.MEGA_DOUBLE; - double endTime = (double) selectionEndTime - / TimelineConstants.MEGA_DOUBLE; - - DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; - - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); - } else { - KernelSelectionData sdata = (KernelSelectionData) odata; - callflowChart.setSelectedData(sdata.getData()); - callflowChart.updateChart(); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + Object odata = selData.getData(); + long selectionStartTime, selectionEndTime; + + if (!(odata instanceof KernelSelectionData)) { + selectionStartTime = selData.getStartTime(); + selectionEndTime = selData.getEndTime(); + + double startTime = (double) selectionStartTime + / TimelineConstants.MEGA_DOUBLE; + double endTime = (double) selectionEndTime + / TimelineConstants.MEGA_DOUBLE; + + DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get( + UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } else { + KernelSelectionData sdata = (KernelSelectionData) odata; + callflowChart.setSelectedData(sdata.getData()); + callflowChart.updateChart(); + } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java deleted file mode 100644 index c7e4939..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jaewon Lim - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.ui.kernel; - -import org.eclipse.swt.widgets.Composite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; - -public class CallFlowTabComposite extends DATabComposite { - - public CallFlowTabComposite(Composite parent, int style) { - super(parent, style); - } - -} 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 f800efd..95daa81 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 @@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -46,17 +45,17 @@ import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardSelectionListener; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class ContextSwitchingChartView extends DAView { - public static final String ID = ContextSwitchingChartView.class.getName(); +public class ContextSwitchingChartView extends DAViewComposite { public final static int KERNEL_CHART_HEIGHT = 40; public final static int KERNEL_COMBO_ITEM_HEIGHT = 24; @@ -69,13 +68,12 @@ public class ContextSwitchingChartView extends DAView { 800, 1600 }; public ContextSwitchingChartView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(KernelPageLabels.CONTEXT_SWITCH_CHART_TITLE); + setTitle(KernelPageLabels.CONTEXT_SWITCH_CHART_TITLE); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); @@ -127,9 +125,9 @@ public class ContextSwitchingChartView extends DAView { if (null == selectItem) { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - ContextSwitchingChartView.ID, + KernelPage.contextViewID, (long) (((DAChartPlotIntervalMarker) contextChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -142,9 +140,9 @@ public class ContextSwitchingChartView extends DAView { } else { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - ContextSwitchingChartView.ID, + KernelPage.contextViewID, (long) (((DAChartPlotIntervalMarker) contextChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -193,18 +191,22 @@ public class ContextSwitchingChartView extends DAView { } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; - double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; - double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; + long start = selData.getStartTime(); + long end = selData.getEndTime(); - DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; + double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); + DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java index bbb85d4..9d34755 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java @@ -72,9 +72,9 @@ public class KernelListTable extends DAWindowingTableComposite { long startTime = Long.parseLong(startData.get(timeColumnIndex)); long endTime = Long.parseLong(endData.get(timeColumnIndex)); - DASelectionData data = new DASelectionData(KernelListView.ID, + DASelectionData data = new DASelectionData(KernelPage.listViewID, startTime, endTime, ti, table); - AnalyzerManager.getCurrentPage().updatePage(data); + AnalyzerManager.getCurrentPage().updateView(data); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java index e82be6b..4134df2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java @@ -32,19 +32,14 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelSelectionData; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.WindowingTableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class KernelListView extends DAView { - public static final String ID = KernelListView.class.getName(); - - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 100, 0 }; - +public class KernelListView extends DAViewComposite { private String[] columnNames = { KernelPageLabels.KERNEL_LIST_VIEW_INDEX, KernelPageLabels.KERNEL_LIST_VIEW_PID, KernelPageLabels.KERNEL_LIST_VIEW_TID, @@ -76,16 +71,12 @@ public class KernelListView extends DAView { KernelListTable tableComp = null; public KernelListView(Composite parent, int style) { - super(parent, style); - name = KernelPageLabels.KERNEL_LIST_VIEW_NAME; + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(KernelPageLabels.KERNEL_LIST_VIEW_TITLE_CORE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(KernelPageLabels.KERNEL_LIST_VIEW_NAME); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new KernelListTable(contents, SWT.NONE, SWT.MULTI @@ -101,25 +92,29 @@ public class KernelListView extends DAView { } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - Object data = selData.getData(); - - if (data instanceof KernelSelectionData) { - KernelSelectionData sdata = (KernelSelectionData) data; - boolean isCore = (sdata.getType() == KernelSelectionData.KERNEL_DATA_TYPE_CONTEXTSWITCH); - tableComp.setSelectedData(sdata.getData(), isCore); - if (isCore) { - tableComp.setColumnVisibility(columnVisibility_core); - } else { - tableComp.setColumnVisibility(columnVisibility_function); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + long start = selData.getStartTime(); + long end = selData.getEndTime(); + Object odata = selData.getData(); + + if (odata instanceof KernelSelectionData) { + KernelSelectionData sdata = (KernelSelectionData) odata; + boolean isCore = (sdata.getType() == KernelSelectionData.KERNEL_DATA_TYPE_CONTEXTSWITCH); + tableComp.setSelectedData(sdata.getData(), isCore); + if (isCore) { + tableComp.setColumnVisibility(columnVisibility_core); + } else { + tableComp.setColumnVisibility(columnVisibility_function); + } + tableComp.updateTable(); } + + ((KernelListTable) tableComp).setSelectionByTime(start, end); tableComp.updateTable(); } - - ((KernelListTable) tableComp).setSelectionByTime(start, end); - tableComp.updateTable(); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java index ae56af0..80fa285 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java @@ -32,15 +32,23 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataManager; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class KernelPage extends DAPageComposite { - public static final String ID = KernelPage.class.getName(); + public static final String pageID = KernelPage.class.getName(); + public static final String contextViewID = ContextSwitchingChartView.class + .getName(); + public static final String callflowTabID = "CallFlowTab.id"; + public static final String callflowViewID = CallFlowChartView.class + .getName(); + public static final String listViewID = KernelListView.class.getName(); + public static final String statViewID = KernelStatisticInfoView.class + .getName(); + private KernelDataManager kdataManager; SashForm baseForm; @@ -51,7 +59,7 @@ public class KernelPage extends DAPageComposite { super(parent, style); kdataManager = KernelDataManager.getInstance(); - name = AnalyzerLabels.COOLBAR_AREA_KERNEL; + setTitle(AnalyzerLabels.COOLBAR_AREA_KERNEL); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_KERNEL_TOOLTIP); this.setLayout(new FillLayout()); @@ -60,11 +68,12 @@ public class KernelPage extends DAPageComposite { baseForm.setLayout(new FillLayout()); leftForm = new SashForm(baseForm, SWT.VERTICAL); - ContextSwitchingChartView kernelChartView = new ContextSwitchingChartView(leftForm, - SWT.NONE); + ContextSwitchingChartView kernelChartView = new ContextSwitchingChartView( + leftForm, SWT.NONE); addView(kernelChartView); - CallFlowTabComposite lefttabView = new CallFlowTabComposite(leftForm, SWT.NONE); - addView(lefttabView); + DATabComposite lefttabView = new DATabComposite(leftForm, + SWT.NONE, false); + addView(callflowTabID, lefttabView); { CallFlowChartView callflowView = new CallFlowChartView( lefttabView.getContentComposite(), SWT.NONE); @@ -78,19 +87,13 @@ public class KernelPage extends DAPageComposite { leftForm.setWeights(new int[] { 60, 40 }); rightForm = new SashForm(baseForm, SWT.VERTICAL); - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, + SWT.NONE, KernelPage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { KernelPage.listViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { KernelPage.listViewID }); addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView.setObservingViews(new String[] { KernelListView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { KernelListView.ID }); - tabView.addView(callstack, false); - } KernelStatisticInfoView statInfo = new KernelStatisticInfoView( rightForm, SWT.NONE); @@ -98,17 +101,23 @@ public class KernelPage extends DAPageComposite { rightForm.setWeights(new int[] { 50, 50 }); baseForm.setWeights(new int[] { 75, 25 }); + + DataManagerRegistry.registerPageDataManager(kdataManager); } @Override - protected void setFormWeights() { - baseForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); - } + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } - @Override - public void updateLog(LogPackage logPack) { - kdataManager.pushLogPackage(logPack); + baseForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java index ff52059..9ab0bb3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java @@ -38,31 +38,23 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; -public class KernelStatisticInfoView extends DAView { - public static final String ID = KernelStatisticInfoView.class.getName(); - +public class KernelStatisticInfoView extends DAViewComposite { private Text detailText = null; private Label labelMessage = null; private int indexScrolledTop = 0; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - public KernelStatisticInfoView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(KernelPageLabels.KERNEL_STATISTIC_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(KernelPageLabels.KERNEL_STATISTIC_TITLE); - Composite detailCom = viewContainer.getContentArea(); + Composite detailCom = getContentArea(); detailCom.setBackground(ColorResources.VIEW_BG_COLOR); detailCom.setLayout(new FormLayout()); FormData labelData = new FormData(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java index 7378e0d..ab2af9f 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java @@ -31,9 +31,10 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.sql.DBTableManager; import org.tizen.dynamicanalyzer.sql.SqlManager; +import org.tizen.dynamicanalyzer.swap.logparser.ReadBlockingQueue; public class ContextDataDBInserter implements Runnable { - private static KernelBlockingQueue>> contextDataQueue = new KernelBlockingQueue>>(); + private static ReadBlockingQueue>> contextDataQueue = new ReadBlockingQueue>>(); private static volatile Thread inserterThread = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java index ab79c8b..a97f5b7 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java @@ -31,9 +31,10 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.sql.DBTableManager; import org.tizen.dynamicanalyzer.sql.SqlManager; +import org.tizen.dynamicanalyzer.swap.logparser.ReadBlockingQueue; public class FunctionDataDBInserter implements Runnable { - private static KernelBlockingQueue>> functionDataQueue = new KernelBlockingQueue>>(); + private static ReadBlockingQueue>> functionDataQueue = new ReadBlockingQueue>>(); private static volatile Thread inserterThread = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java index 39f1d9d..7ddca0a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java @@ -30,26 +30,22 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.PriorityQueue; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataTimeComparator; -public class KernelDataManager implements Runnable { +public class KernelDataManager extends PageDataManager { private static KernelDataManager instance = null; - - private Thread updateLogThread = null; - private KernelBlockingQueue logPackQueue = null; private KernelDataMaker kdataMaker = null; - + public KernelDataManager() { - logPackQueue = new KernelBlockingQueue(); kdataMaker = KernelDataMaker.getInstance(); } - + public synchronized static KernelDataManager getInstance() { if (null == instance) { instance = new KernelDataManager(); @@ -57,15 +53,11 @@ public class KernelDataManager implements Runnable { return instance; } - public void pushLogPackage(LogPackage pack) { - logPackQueue.offer(pack); - } - @Override public void run() { while (!AnalyzerManager.isExit()) { - LogPackage pack = logPackQueue.poll(); - if (null == pack) { + LogPackage pack = pollPack(); + if (null == pack) { // stop thread break; } @@ -75,33 +67,7 @@ public class KernelDataManager implements Runnable { } /* log for debug */ - System.out.println("kernel chart manager thread end!!"); //$NON-NLS-1$ - } - - public void startUpdateLogThread() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - updateLogThread = new Thread(null, this, - AnalyzerConstants.KERNEL_CHART_MANAGER_THREAD); - updateLogThread.start(); - } - } - - public void stopUpdateLogThread() { - if (null != updateLogThread && updateLogThread.isAlive()) { - try { - sendNotify(); - updateLogThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("thread chart manager joined!"); //$NON-NLS-1$ - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - public void sendNotify() { - synchronized (logPackQueue) { - logPackQueue.notifyAll(); - } + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { @@ -174,7 +140,7 @@ public class KernelDataManager implements Runnable { default: break; } - + kernelLogs.add(top); } while (true); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java index 1467334..ba3396e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java @@ -42,18 +42,13 @@ import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.NetworkData; -import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; 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.widgets.chart.DAChartPlotIntervalMarker; -import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; public class NetworkApiListTable extends DAApiListTableComposite { - private DAChartBoard chartBoard = null; - private final int tableTimeColumn = 1; private final int tableElapsedTimeColumn = 2; private final int tableApiNameColumn = 5; @@ -89,10 +84,9 @@ public class NetworkApiListTable extends DAApiListTableComposite { } DASelectionData selData = new DASelectionData( - NetworkApiListView.ID, startTime, endTime, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - NetworkApiListView.ID); + NetworkPage.listViewID, startTime, endTime, items, + table); + AnalyzerManager.getCurrentPage().updateView(selData); DATableDataFormat dataFormats = (DATableDataFormat) items[0] .getData(); @@ -113,12 +107,11 @@ public class NetworkApiListTable extends DAApiListTableComposite { CommonConstants.EMPTY); } - AnalyzerManager.getCurrentPage().updatePage(); + AnalyzerManager.getCurrentPage().updateView(); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub } }); } @@ -170,7 +163,7 @@ public class NetworkApiListTable extends DAApiListTableComposite { @Override protected List makeTableInput() { NetworkApiListView view = (NetworkApiListView) AnalyzerManager - .getCurrentPage().getViewMap().get(NetworkApiListView.ID); + .getCurrentPage().getView(NetworkPage.listViewID); NetworkChartData data = view.getPageData(); if (null == data) { @@ -342,14 +335,6 @@ public class NetworkApiListTable extends DAApiListTableComposite { return input; } - private DAChartBoard getChartBoard() { - if (chartBoard == null) { - chartBoard = (DAChartBoard) (AnalyzerManager.getCurrentPage() - .getView(NetworkChartView.ID).getControl()); - } - return chartBoard; - } - protected void actionSetStartEnd(int type) { GridItem item = table.getItem(mousePoint); if (null != item) { @@ -358,7 +343,6 @@ public class NetworkApiListTable extends DAApiListTableComposite { long time = data.getTime(); double startTime = -1; double endTime = -1; - DAChartBoard board = getChartBoard(); if (type == START_TIME) { rangeDataManager.setMarkerStartTime(time); @@ -373,12 +357,10 @@ public class NetworkApiListTable extends DAApiListTableComposite { / TimelineConstants.MEGA_DOUBLE; } - board.setTimelineMarkerStartTime(startTime); - board.setTimelineMarkerEndTime(endTime); + NetworkChartView chartview = (NetworkChartView) (AnalyzerManager + .getCurrentPage().getView(NetworkPage.chartViewID)); - ((DAChartPlotIntervalMarker) board.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - startTime, endTime); + chartview.setRangeMarker(startTime, endTime); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java index a6aa339..5420713 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListView.java @@ -36,25 +36,21 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class NetworkApiListView extends DAView { - - public static final String ID = NetworkApiListView.class.getName(); +public class NetworkApiListView extends DAViewComposite { private NetworkChartData data; private long analysisStartTime = 0; private long analysisEndTime = 0; private long selectionStartTime = 0; private long selectionEndTime = 0; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 100, 0 }; private int preSelectionPId = 1; private String[] columnNames = { @@ -89,15 +85,12 @@ public class NetworkApiListView extends DAView { NetworkApiListTable tableComp = null; public NetworkApiListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(NetworkPageLabels.NETWORK_API_LIST_VIEW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(NetworkPageLabels.NETWORK_API_LIST_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new NetworkApiListTable(contents, SWT.NONE, SWT.MULTI @@ -153,51 +146,57 @@ public class NetworkApiListView extends DAView { } @Override - public void updateView(DASelectionData data) { - NetworkChartManager.getInstance().setPacketMessage( - CommonConstants.EMPTY); - NetworkChartManager.getInstance().setSendAckTime( - CommonConstants.EMPTY); - NetworkChartData pageData = (NetworkChartData) data.getData(); - - if (!(pageData instanceof NetworkChartData)) { - selectionStartTime = data.getStartTime(); - selectionEndTime = data.getEndTime(); - } else { - this.data = pageData; - } - tableComp.getTable().removeAll(); - tableComp.updateTable(); - tableComp.setSelectionByTime(selectionStartTime, selectionEndTime); - - } - - @Override - public void setSelection(LogData data) { - if (null == data) { - return; - } - int seq = data.getSeq(); - tableComp.updateTable(); - int nSize = tableComp.getTable().getItemCount(); - for (int ii = 0; ii < nSize; ii++) { - if (tableComp.getTable().getItem(ii).getText(0) - .equals(Integer.toString(seq))) { - tableComp.getTable().setSelection(ii); - tableComp - .getTable() - .getVerticalBar() - .setSelection( - getScrollSelectionIndex(tableComp.getTable(), - ii)); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + if (selData.isLogData()) { + Object odata = selData.getData(); + if (odata != null && (odata instanceof LogData)) { + LogData ldata = (LogData) odata; + int seq = ldata.getSeq(); + tableComp.updateTable(); + int nSize = tableComp.getTable().getItemCount(); + for (int ii = 0; ii < nSize; ii++) { + if (tableComp.getTable().getItem(ii).getText(0) + .equals(Integer.toString(seq))) { + tableComp.getTable().setSelection(ii); + tableComp + .getTable() + .getVerticalBar() + .setSelection( + getScrollSelectionIndex( + tableComp.getTable(), ii)); + tableComp.updateTable(); + } + } + long selectedTime = ldata.getTime(); + DASelectionData sdata = new DASelectionData( + NetworkPage.listViewID, selectedTime, selectedTime, + tableComp.getTable().getSelection(), + tableComp.getTable()); + AnalyzerManager.getCurrentPage().updateView(sdata); + } + } else { + NetworkChartManager.getInstance().setPacketMessage( + CommonConstants.EMPTY); + NetworkChartManager.getInstance().setSendAckTime( + CommonConstants.EMPTY); + NetworkChartData pageData = (NetworkChartData) selData + .getData(); + + if (!(pageData instanceof NetworkChartData)) { + selectionStartTime = selData.getStartTime(); + selectionEndTime = selData.getEndTime(); + } else { + this.data = pageData; + } + tableComp.getTable().removeAll(); tableComp.updateTable(); + tableComp.setSelectionByTime(selectionStartTime, + selectionEndTime); } } - long selectedTime = data.getTime(); - DASelectionData selData = new DASelectionData(NetworkApiListView.ID, - selectedTime, selectedTime, - tableComp.getTable().getSelection(), tableComp.getTable()); - AnalyzerManager.getCurrentPage().updatePage(selData); } private int getScrollSelectionIndex(Grid table, int selection) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java index 15a8941..69945dc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java @@ -29,17 +29,16 @@ package org.tizen.dynamicanalyzer.ui.network; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.logparser.LogListQueue; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -public class NetworkChartManager implements Runnable { - - private LogListQueue logListQueue = null; - private Thread updateLogThread = null; +public class NetworkChartManager extends PageDataManager { private NetworkDataMaker networkDataMaker = null; @@ -62,40 +61,6 @@ public class NetworkChartManager implements Runnable { return instance; } - public LogListQueue getLogListQueue() { - if (null == logListQueue) { - logListQueue = new LogListQueue(); - } - return logListQueue; - } - - public void startUpdateLogThread() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - updateLogThread = new Thread(null, getInstance(), - AnalyzerConstants.NETWORK_CHART_MANAGER_THREAD); - updateLogThread.start(); - } - } - - public void stopUpdateLogThread() { - if (null != updateLogThread && updateLogThread.isAlive()) { - try { - sendNotify(); - updateLogThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("network chart manager joined!"); //$NON-NLS-1$ - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - public boolean isThreadAlive() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - return false; - } - return true; - } - public NetworkDataMaker getNetworkDataMaker() { return networkDataMaker; } @@ -103,17 +68,21 @@ public class NetworkChartManager implements Runnable { /*** make network data thread ***/ @Override public void run() { - LogListQueue logListQueue = getInstance().getLogListQueue(); while (!AnalyzerManager.isExit()) { - List logs = logListQueue.getFirst(); - if (null == logs) { + LogPackage pack = pollPack(); + if (pack == null) // stop thread break; + + Logs logs = pack.getLogs(DataChannelConstants.MSG_PROBE_NETWORK); + if (null != logs && logs.getRawLogs().size() != 0) { + List inputs = logs.getLogs(); + + getNetworkDataMaker().makeData(inputs); } - getInstance().getNetworkDataMaker().makeData(logs); } /* log for debug */ - System.out.println("file manager thread end!!"); //$NON-NLS-1$ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { @@ -121,13 +90,6 @@ public class NetworkChartManager implements Runnable { networkDataMaker.clear(); } - public static void sendNotify() { - LogListQueue logListQueue = getInstance().getLogListQueue(); - synchronized (logListQueue) { - logListQueue.notifyAll(); - } - } - public int[] getParentChartIndex(String seq) { int parentChartIndex = -1; NetworkChartData chartData = null; @@ -178,9 +140,8 @@ public class NetworkChartManager implements Runnable { public boolean isEqulasSeq(NetworkChartData chartData, String seq) { for (int j = 0; j < chartData.getContents().size(); j++) { - - int seqlong = chartData.getContents().get(j).getContents() - .getSeq(); + + int seqlong = chartData.getContents().get(j).getContents().getSeq(); if (Long.toString(seqlong).equals(seq)) { return true; } @@ -257,5 +218,4 @@ public class NetworkChartManager implements Runnable { this.sendAckTime = sendAckTime; } - } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java index 82dae8e..ad5918b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java @@ -27,8 +27,6 @@ package org.tizen.dynamicanalyzer.ui.network; -import java.util.List; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.events.PaintEvent; @@ -39,14 +37,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -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.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; @@ -54,15 +48,15 @@ import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardSelectionListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class NetworkChartView extends DAView { - public static final String ID = NetworkChartView.class.getName(); +public class NetworkChartView extends DAViewComposite { public final static int NETWORK_CHART_HEIGHT = 40; private final Composite contents; @@ -74,13 +68,12 @@ public class NetworkChartView extends DAView { .getInstance(); public NetworkChartView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(NetworkPageLabels.NETWORK_CHART); + setTitle(NetworkPageLabels.NETWORK_CHART); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); contents.setLayout(stackLayout); @@ -93,9 +86,9 @@ public class NetworkChartView extends DAView { public void handleSelectionEvent(DAChartBoardItem item) { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - NetworkChartView.ID, + NetworkPage.chartViewID, (long) (((DAChartPlotIntervalMarker) networkChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -177,48 +170,44 @@ public class NetworkChartView extends DAView { } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - - double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; - double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; - // double middleTime = (startTime + endTime) / 2.0; - // if (start == end) { - // middleTime = startTime; - // } - - DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; - - // chartBoard.setVisibleMiddleTime(middleTime); - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); - } - - @Override - public void setSelection(LogData data) { - if (null == data) { - return; - } - int seq = data.getSeq(); - int selectedIndex[] = NetworkChartManager.getInstance() - .getParentChartIndex(Integer.toString(seq)); - networkChart.selectItem( - selectedIndex[0], - NetworkChartManager.getInstance().getChildChartIndex( - selectedIndex[1], Integer.toString(seq))); - } - - @Override - public void updateLog(LogPackage logPack) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_NETWORK); - if (null == logs || logs.getRawLogs().size() == 0) { - return; + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + if (selData.isLogData()) { + Object odata = selData.getData(); + if (null != odata && (odata instanceof LogData)) { + LogData ldata = (LogData) odata; + int seq = ldata.getSeq(); + int selectedIndex[] = NetworkChartManager.getInstance() + .getParentChartIndex(Integer.toString(seq)); + networkChart.selectItem( + selectedIndex[0], + NetworkChartManager.getInstance() + .getChildChartIndex(selectedIndex[1], + Integer.toString(seq))); + } + } else { + long start = selData.getStartTime(); + long end = selData.getEndTime(); + + double startTime = (double) start + / TimelineConstants.MEGA_DOUBLE; + double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; + // double middleTime = (startTime + endTime) / 2.0; + // if (start == end) { + // middleTime = startTime; + // } + + DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + + // chartBoard.setVisibleMiddleTime(middleTime); + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get( + UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } } - List inputs = logs.getLogs(); - - NetworkChartManager.getInstance().getLogListQueue().putLog(inputs); } @Override @@ -258,4 +247,12 @@ public class NetworkChartView extends DAView { board.addIntervalMarker(rangeMarker); } + public void setRangeMarker(double starttime, double endtime) { + networkChart.setTimelineMarkerStartTime(starttime); + networkChart.setTimelineMarkerEndTime(endtime); + + ((DAChartPlotIntervalMarker) networkChart.getMarkers().get( + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + starttime, endtime); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java index 712a100..5590a24 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDetailInfoView.java @@ -42,17 +42,14 @@ import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.utils.Formatter; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class NetworkDetailInfoView extends DAView { - - public static final String ID = NetworkDetailInfoView.class.getName(); - +public class NetworkDetailInfoView extends DAViewComposite { private Composite contents = null; private Text detailText = null; private Label labelMessage = null; @@ -63,22 +60,17 @@ public class NetworkDetailInfoView extends DAView { private final static String heightFormAttachment = CommonConstants.NEW_LINE + CommonConstants.NEW_LINE; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - private void init() { detailText.setText(CommonConstants.EMPTY); } public NetworkDetailInfoView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(NetworkPageLabels.NETWORK_DETAILS_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(NetworkPageLabels.NETWORK_DETAILS_TITLE); - Composite detailCom = viewContainer.getContentArea(); + Composite detailCom = getContentArea(); detailCom.setBackground(ColorResources.VIEW_BG_COLOR); detailCom.setLayout(new FormLayout()); FormData labelData = new FormData(); @@ -157,9 +149,11 @@ public class NetworkDetailInfoView extends DAView { } @Override - public void updateView(DASelectionData data) { - updateData(); - indexScrolledTop = 0; + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + updateData(); + indexScrolledTop = 0; + } } @Override @@ -169,7 +163,7 @@ public class NetworkDetailInfoView extends DAView { private void updateData() { NetworkApiListView view = (NetworkApiListView) AnalyzerManager - .getCurrentPage().getViewMap().get(NetworkApiListView.ID); + .getCurrentPage().getView(NetworkPage.listViewID); NetworkChartData selectData = view.getPageData(); if (null == selectData) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java index a818d6f..b2560f2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java @@ -33,22 +33,26 @@ import org.eclipse.swt.widgets.Composite; 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.network.NetworkApiListView; import org.tizen.dynamicanalyzer.ui.network.NetworkDetailInfoView; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class NetworkPage extends DAPageComposite { - public static final String ID = NetworkPage.class.getName(); + public static final String pageID = NetworkPage.class.getName(); + public static final String chartViewID = NetworkChartView.class.getName(); + public static final String listViewID = NetworkApiListView.class.getName(); + public static final String detailViewID = NetworkDetailInfoView.class + .getName(); + SashForm baseForm; SashForm leftForm; SashForm rightForm; public NetworkPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_NETWORK; + setTitle(AnalyzerLabels.COOLBAR_AREA_NETWORK); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_NETWORK_TOOLTIP); this.setLayout(new FillLayout()); @@ -67,20 +71,13 @@ public class NetworkPage extends DAPageComposite { leftForm.setWeights(new int[] { 60, 40 }); rightForm = new SashForm(baseForm, SWT.VERTICAL); - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, + SWT.NONE, NetworkPage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { NetworkPage.listViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { NetworkPage.listViewID }); addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView - .setObservingViews(new String[] { NetworkApiListView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { NetworkApiListView.ID }); - tabView.addView(callstack, false); - } NetworkDetailInfoView detailInfo = new NetworkDetailInfoView(rightForm, SWT.NONE); @@ -92,12 +89,22 @@ public class NetworkPage extends DAPageComposite { baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); - + + DataManagerRegistry.registerPageDataManager(NetworkChartManager.getInstance()); } @Override - protected void setFormWeights() { - baseForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + baseForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java index 19af672..af41a7a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java @@ -32,9 +32,16 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Set; +import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.GLPageLabels; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.GLES20LogData; +import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.opengl.GLConstantMap; +import org.tizen.dynamicanalyzer.ui.opengl.data.inserter.GLContextDataInserter; import org.tizen.dynamicanalyzer.ui.opengl.data.model.FrameCountInfo; import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLAPIData; import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLFrameData; @@ -43,7 +50,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLFrameTimeChart; import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextTreeTable; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -public class GLDataMaker { +public class GLDataMaker extends PageDataManager { public static final String DELIMITER = "`,"; public static final String EMPTY = ""; private static final String SPACE = " "; @@ -58,33 +65,33 @@ public class GLDataMaker { private static int API_TYPE_INIT = 0; private static int API_TYPE_CONTEXT = 1; -// private static int API_TYPE_NO_CONTEXT = 2; + // private static int API_TYPE_NO_CONTEXT = 2; /* EnableCap */ - private static final String GL_TEXTURE_2D ="de1"; - private static final String GL_CULL_FACE ="b44"; - private static final String GL_BLEND ="be2"; - private static final String GL_DITHER ="bd0"; - private static final String GL_STENCIL_TEST ="b90"; - private static final String GL_DEPTH_TEST ="b71"; - private static final String GL_SCISSOR_TEST ="c11"; - private static final String GL_POLYGON_OFFSET_FILL ="8037"; -// private static final String GL_SAMPLE_ALPHA_TO_COVERAGE ="809e"; -// private static final String GL_SAMPLE_COVERAGE ="80a0"; + private static final String GL_TEXTURE_2D = "de1"; + private static final String GL_CULL_FACE = "b44"; + private static final String GL_BLEND = "be2"; + private static final String GL_DITHER = "bd0"; + private static final String GL_STENCIL_TEST = "b90"; + private static final String GL_DEPTH_TEST = "b71"; + private static final String GL_SCISSOR_TEST = "c11"; + private static final String GL_POLYGON_OFFSET_FILL = "8037"; + // private static final String GL_SAMPLE_ALPHA_TO_COVERAGE ="809e"; + // private static final String GL_SAMPLE_COVERAGE ="80a0"; /* CullFaceMode */ - private static final String GL_FRONT ="404"; - private static final String GL_BACK ="405"; - private static final String GL_FRONT_AND_BACK ="408"; + private static final String GL_FRONT = "404"; + private static final String GL_BACK = "405"; + private static final String GL_FRONT_AND_BACK = "408"; /* Pixel */ - private static final String GL_PACK_ALIGNMENT ="d05"; - private static final String GL_UNPACK_ALIGNMENT ="cf5"; + private static final String GL_PACK_ALIGNMENT = "d05"; + private static final String GL_UNPACK_ALIGNMENT = "cf5"; /* TextureBinding */ - private static final String GL_TEXTURE_CUBE_MAP ="8513"; + private static final String GL_TEXTURE_CUBE_MAP = "8513"; /* TextureParameterName */ - private static final String GL_TEXTURE_MAG_FILTER ="2800"; - private static final String GL_TEXTURE_MIN_FILTER ="2801"; - private static final String GL_TEXTURE_WRAP_S ="2802"; - private static final String GL_TEXTURE_WRAP_T ="2803"; - + private static final String GL_TEXTURE_MAG_FILTER = "2800"; + private static final String GL_TEXTURE_MIN_FILTER = "2801"; + private static final String GL_TEXTURE_WRAP_S = "2802"; + private static final String GL_TEXTURE_WRAP_T = "2803"; + /* GL APIs */ private static final String API_GL_BLEND_COLOR = "glBlendColor"; private static final String API_GL_BLEND_EQ = "glBlendEquation"; @@ -95,7 +102,7 @@ public class GLDataMaker { private static final String API_GL_BUFFER_DATA = "glBufferData"; private static final String API_GL_BUFFER_GEN = "glGenBuffers"; private static final String API_GL_BUFFER_DEL = "glDeleteBuffers"; - private static final String API_GL_CULLFACE= "glFrontFace"; + private static final String API_GL_CULLFACE = "glFrontFace"; private static final String API_GL_DEPTH_FUNC = "glDepthFunc"; private static final String API_GL_DEPTH_RANGEF = "glDepthRangef"; public static final String API_GL_DISABLE_VAA = "glDisableVertexAttribArray"; @@ -137,35 +144,35 @@ public class GLDataMaker { private static final String API_GL_VERTEX_ATTRIB4FV = "glVertexAttrib4fv"; private static final String API_GL_VERTEX_ATTRIB_POINTER = "glVertexAttribPointer"; private static final String API_GL_VIEWPORT = "glViewport"; - + private static final String API_EGL_SWAPBUFFERS = "eglSwapBuffers"; private static final String API_SGL_SWAPBUFFERS = "_SglSwapBuffers"; - + private static GLDataMaker instance = null; private static final int CONTEXT_VALUE_SIZE = GLContextDBEnum.values().length; private int currentFrameIndex; private List glFrameDataList; private List frameCountInfoList; - + private CurrentContextValueList currentContextValueList; private ArrayList> contextValueDBInputList; private ArrayList> contextValueChangeList; private ArrayList> contextValueSetList; private ArrayList> contextChangeInfoDBInputList; - + private List gvaV0ValueList; private List gvaV1ValueList; private List gvaV2ValueList; private List gvaV3ValueList; - + private List gvaEnabledValueList; private List gvaSizeValueList; private List gvaTypeValueList; private List gvaNormalValueList; private List gvaStrideValueList; private List gvaPointerValueList; - + private LinkedHashMap programIDMap; private LinkedHashMap programVShaderMap; private LinkedHashMap programFShaderMap; @@ -177,18 +184,18 @@ public class GLDataMaker { private LinkedHashMap> programUniformNameMap; private LinkedHashMap> programUniformSizeMap; private LinkedHashMap> programUniformTypeMap; - + private LinkedHashMap shaderIDMap; private LinkedHashMap shaderTypeMap; private LinkedHashMap shaderSourceMap; - + private String vboBindingArray; private String vboBindingElementArray; private LinkedHashMap vboIDMap; private LinkedHashMap vboSizeMap; private LinkedHashMap vboDataMap; private LinkedHashMap vboUsageMap; - + private List textureUnit2dValueList; private List textureUnitCubeValueList; private LinkedHashMap textureObjIDMap; @@ -211,48 +218,48 @@ public class GLDataMaker { glFrameDataList.add(new GLFrameData(1)); frameCountInfoList = new ArrayList(); frameCountInfoList.add(new FrameCountInfo(0)); - + currentContextValueList = new CurrentContextValueList(); - for(int i = 0; i <= CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i <= CONTEXT_VALUE_SIZE; i++) { currentContextValueList.add(EMPTY); } - + contextValueDBInputList = new ArrayList>(); - + contextValueChangeList = new ArrayList>(); - for(int i = 0; i < CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i < CONTEXT_VALUE_SIZE; i++) { contextValueChangeList.add(new ArrayList()); } - + contextValueSetList = new ArrayList>(); - for(int i = 0; i < CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i < CONTEXT_VALUE_SIZE; i++) { contextValueSetList.add(new ArrayList()); } - + contextChangeInfoDBInputList = new ArrayList>(); - + gvaV0ValueList = new ArrayList(); gvaV1ValueList = new ArrayList(); gvaV2ValueList = new ArrayList(); gvaV3ValueList = new ArrayList(); - + gvaEnabledValueList = new ArrayList(); gvaSizeValueList = new ArrayList(); gvaTypeValueList = new ArrayList(); gvaNormalValueList = new ArrayList(); gvaStrideValueList = new ArrayList(); gvaPointerValueList = new ArrayList(); - programIDMap = new LinkedHashMap(); + programIDMap = new LinkedHashMap(); programVShaderMap = new LinkedHashMap(); programFShaderMap = new LinkedHashMap(); - programAttribIndexMap = new LinkedHashMap>(); - programAttribNameMap = new LinkedHashMap>(); - programAttribSizeMap = new LinkedHashMap>(); - programAttribTypeMap = new LinkedHashMap>(); - programUniformIndexMap = new LinkedHashMap>(); - programUniformNameMap = new LinkedHashMap>(); - programUniformSizeMap = new LinkedHashMap>(); - programUniformTypeMap = new LinkedHashMap>(); + programAttribIndexMap = new LinkedHashMap>(); + programAttribNameMap = new LinkedHashMap>(); + programAttribSizeMap = new LinkedHashMap>(); + programAttribTypeMap = new LinkedHashMap>(); + programUniformIndexMap = new LinkedHashMap>(); + programUniformNameMap = new LinkedHashMap>(); + programUniformSizeMap = new LinkedHashMap>(); + programUniformTypeMap = new LinkedHashMap>(); shaderIDMap = new LinkedHashMap(); shaderTypeMap = new LinkedHashMap(); shaderSourceMap = new LinkedHashMap(); @@ -277,98 +284,132 @@ public class GLDataMaker { glFrameDataList.add(new GLFrameData(0)); frameCountInfoList.clear(); frameCountInfoList.add(new FrameCountInfo(0)); - + currentContextValueList.clear(); - for(int i = 0; i <= CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i <= CONTEXT_VALUE_SIZE; i++) { currentContextValueList.add(EMPTY); } - + contextValueChangeList.clear(); - for(int i = 0; i < CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i < CONTEXT_VALUE_SIZE; i++) { contextValueChangeList.add(new ArrayList()); } - + contextValueSetList.clear(); - for(int i = 0; i < CONTEXT_VALUE_SIZE; i++) { + for (int i = 0; i < CONTEXT_VALUE_SIZE; i++) { contextValueSetList.add(new ArrayList()); } - - currentContextValueList.set(GLContextDBEnum.VBO_BINDING.ordinal(), "(0/0)"); - + + currentContextValueList.set(GLContextDBEnum.VBO_BINDING.ordinal(), + "(0/0)"); + currentContextValueList.set(GLContextDBEnum.VIEWPORT_X.ordinal(), ZERO); currentContextValueList.set(GLContextDBEnum.VIEWPORT_Y.ordinal(), ZERO); currentContextValueList.set(GLContextDBEnum.VIEWPORT_W.ordinal(), "?"); currentContextValueList.set(GLContextDBEnum.VIEWPORT_H.ordinal(), "?"); - - currentContextValueList.set(GLContextDBEnum.DEPTH_RANGE_N.ordinal(), ZERO); - currentContextValueList.set(GLContextDBEnum.DEPTH_RANGE_F.ordinal(), ONE); - + + currentContextValueList.set(GLContextDBEnum.DEPTH_RANGE_N.ordinal(), + ZERO); + currentContextValueList.set(GLContextDBEnum.DEPTH_RANGE_F.ordinal(), + ONE); + currentContextValueList.set(GLContextDBEnum.LINE_W.ordinal(), "1"); - - currentContextValueList.set(GLContextDBEnum.CULLING_ENABLED.ordinal(), DISABLED); - currentContextValueList.set(GLContextDBEnum.CULLING_ORI.ordinal(), "GL_CCW"); - currentContextValueList.set(GLContextDBEnum.CULLING_MODE.ordinal(), "GL_BACK"); - - currentContextValueList.set(GLContextDBEnum.POLY_ENABLED.ordinal(), DISABLED); - currentContextValueList.set(GLContextDBEnum.POLY_FACTOR.ordinal(), ZERO); + + currentContextValueList.set(GLContextDBEnum.CULLING_ENABLED.ordinal(), + DISABLED); + currentContextValueList.set(GLContextDBEnum.CULLING_ORI.ordinal(), + "GL_CCW"); + currentContextValueList.set(GLContextDBEnum.CULLING_MODE.ordinal(), + "GL_BACK"); + + currentContextValueList.set(GLContextDBEnum.POLY_ENABLED.ordinal(), + DISABLED); + currentContextValueList + .set(GLContextDBEnum.POLY_FACTOR.ordinal(), ZERO); currentContextValueList.set(GLContextDBEnum.POLY_UNITS.ordinal(), ZERO); - - currentContextValueList.set(GLContextDBEnum.SCISSOR_ENABLED.ordinal(), DISABLED); + + currentContextValueList.set(GLContextDBEnum.SCISSOR_ENABLED.ordinal(), + DISABLED); currentContextValueList.set(GLContextDBEnum.SCISSOR_X.ordinal(), ZERO); currentContextValueList.set(GLContextDBEnum.SCISSOR_Y.ordinal(), ZERO); currentContextValueList.set(GLContextDBEnum.SCISSOR_W.ordinal(), "?"); currentContextValueList.set(GLContextDBEnum.SCISSOR_H.ordinal(), "?"); - - currentContextValueList.set(GLContextDBEnum.STENCIL_ENABLED.ordinal(), DISABLED); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), "GL_ALWAYS"); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), "1"); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), "?"); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), "GL_KEEP"); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), "GL_KEEP"); - currentContextValueList.set(GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), "GL_KEEP"); - - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), "GL_ALWAYS"); - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_REF.ordinal(), "1"); - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), "?"); - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), "GL_KEEP"); - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), "GL_KEEP"); - currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), "GL_KEEP"); - - currentContextValueList.set(GLContextDBEnum.DEPTH_ENABLED.ordinal(), DISABLED); - currentContextValueList.set(GLContextDBEnum.DEPTH_FUNC.ordinal(), "GL_LESS"); - - currentContextValueList.set(GLContextDBEnum.BLEND_ENABLED.ordinal(), DISABLED); - currentContextValueList.set(GLContextDBEnum.BLEND_SRC_RGB.ordinal(), "GL_ONE"); - currentContextValueList.set(GLContextDBEnum.BLEND_SRC_A.ordinal(), "GL_ONE"); - currentContextValueList.set(GLContextDBEnum.BLEND_DEST_RGB.ordinal(), "GL_ZERO"); - currentContextValueList.set(GLContextDBEnum.BLEND_DEST_A.ordinal(), "GL_ZERO"); - currentContextValueList.set(GLContextDBEnum.BLEND_RGB_EQ.ordinal(), "GL_FUNC_ADD"); - currentContextValueList.set(GLContextDBEnum.BLEND_A_EQ.ordinal(), "GL_FUNC_ADD"); - currentContextValueList.set(GLContextDBEnum.BLEND_COLOR.ordinal(), "0,0,0,0"); - - currentContextValueList.set(GLContextDBEnum.DITHER_ENABLED.ordinal(), ENABLED); - + + currentContextValueList.set(GLContextDBEnum.STENCIL_ENABLED.ordinal(), + DISABLED); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), "GL_ALWAYS"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), "1"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), "?"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), "GL_KEEP"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), "GL_KEEP"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), "GL_KEEP"); + + currentContextValueList.set( + GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), "GL_ALWAYS"); + currentContextValueList.set(GLContextDBEnum.STENCIL_BACK_REF.ordinal(), + "1"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), "?"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), "GL_KEEP"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), "GL_KEEP"); + currentContextValueList.set( + GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), "GL_KEEP"); + + currentContextValueList.set(GLContextDBEnum.DEPTH_ENABLED.ordinal(), + DISABLED); + currentContextValueList.set(GLContextDBEnum.DEPTH_FUNC.ordinal(), + "GL_LESS"); + + currentContextValueList.set(GLContextDBEnum.BLEND_ENABLED.ordinal(), + DISABLED); + currentContextValueList.set(GLContextDBEnum.BLEND_SRC_RGB.ordinal(), + "GL_ONE"); + currentContextValueList.set(GLContextDBEnum.BLEND_SRC_A.ordinal(), + "GL_ONE"); + currentContextValueList.set(GLContextDBEnum.BLEND_DEST_RGB.ordinal(), + "GL_ZERO"); + currentContextValueList.set(GLContextDBEnum.BLEND_DEST_A.ordinal(), + "GL_ZERO"); + currentContextValueList.set(GLContextDBEnum.BLEND_RGB_EQ.ordinal(), + "GL_FUNC_ADD"); + currentContextValueList.set(GLContextDBEnum.BLEND_A_EQ.ordinal(), + "GL_FUNC_ADD"); + currentContextValueList.set(GLContextDBEnum.BLEND_COLOR.ordinal(), + "0,0,0,0"); + + currentContextValueList.set(GLContextDBEnum.DITHER_ENABLED.ordinal(), + ENABLED); + currentContextValueList.set(GLContextDBEnum.PACK_ALIGN.ordinal(), "4"); - currentContextValueList.set(GLContextDBEnum.UNPACK_ALIGN.ordinal(), "4"); - - currentContextValueList.set(GLContextDBEnum.TEXTURE_ACTIVE.ordinal(), "GL_TEXTURE0"); - - + currentContextValueList + .set(GLContextDBEnum.UNPACK_ALIGN.ordinal(), "4"); + + currentContextValueList.set(GLContextDBEnum.TEXTURE_ACTIVE.ordinal(), + "GL_TEXTURE0"); + contextValueDBInputList.clear(); contextChangeInfoDBInputList.clear(); - + gvaV0ValueList.clear(); gvaV1ValueList.clear(); gvaV2ValueList.clear(); gvaV3ValueList.clear(); - + gvaEnabledValueList.clear(); gvaSizeValueList.clear(); gvaTypeValueList.clear(); gvaNormalValueList.clear(); gvaStrideValueList.clear(); gvaPointerValueList.clear(); - + programIDMap.clear(); programVShaderMap.clear(); programFShaderMap.clear(); @@ -380,21 +421,21 @@ public class GLDataMaker { programUniformNameMap.clear(); programUniformSizeMap.clear(); programUniformTypeMap.clear(); - + shaderIDMap.clear(); shaderTypeMap.clear(); shaderSourceMap.clear(); - + vboBindingArray = ZERO; vboBindingElementArray = ZERO; vboIDMap.clear(); vboSizeMap.clear(); vboDataMap.clear(); vboUsageMap.clear(); - + textureUnit2dValueList.clear(); textureUnitCubeValueList.clear(); - + textureObjIDMap.clear(); textureObjMagFuncMap.clear(); textureObjMinFuncMap.clear(); @@ -409,31 +450,32 @@ public class GLDataMaker { String apiName = logData.getApiName(); String parameter = logData.getArgs(); long errorNo = logData.getErrno(); - - //FIXME - if(apiName.equals(API_SGL_SWAPBUFFERS) || apiName.equals(API_EGL_SWAPBUFFERS)) { + + // FIXME + if (apiName.equals(API_SGL_SWAPBUFFERS) + || apiName.equals(API_EGL_SWAPBUFFERS)) { errorNo = 0; logData.setErrNo(0); logData.setApiName(API_EGL_SWAPBUFFERS); } - + if (apiType != API_TYPE_INIT) { glFrameDataList.get(currentFrameIndex).addGLAPIData( new GLAPIData(logData)); } - if(apiType == API_TYPE_INIT) { + if (apiType == API_TYPE_INIT) { String contextValues[] = logData.getContextValue().split(COMMA); int maxVertexAttribs = Integer.parseInt(contextValues[0]); int maxTextureUnits = Integer.parseInt(contextValues[1].trim()); - + /* GVA */ - for(int i = 0; i < maxVertexAttribs; i++) { + for (int i = 0; i < maxVertexAttribs; i++) { gvaV0ValueList.add(ZERO); gvaV1ValueList.add(ZERO); gvaV2ValueList.add(ZERO); gvaV3ValueList.add(ONE); - + gvaEnabledValueList.add(DISABLED); gvaSizeValueList.add(FOUR); gvaTypeValueList.add(GL_FLOAT); @@ -441,36 +483,52 @@ public class GLDataMaker { gvaStrideValueList.add(ONE); gvaPointerValueList.add(ZERO); } - currentContextValueList.set(GLContextDBEnum.GVA_V0.ordinal(), makeSeperatedString(gvaV0ValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_V1.ordinal(), makeSeperatedString(gvaV1ValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_V2.ordinal(), makeSeperatedString(gvaV2ValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_V3.ordinal(), makeSeperatedString(gvaV3ValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_ENABLED.ordinal(), makeSeperatedString(gvaEnabledValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_SIZE.ordinal(), makeSeperatedString(gvaSizeValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_TYPE.ordinal(), makeSeperatedString(gvaTypeValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_NORMAL.ordinal(), makeSeperatedString(gvaNormalValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_STRIDE.ordinal(), makeSeperatedString(gvaStrideValueList)); - currentContextValueList.set(GLContextDBEnum.GVA_POINTER.ordinal(), makeSeperatedString(gvaPointerValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_V0.ordinal(), + makeSeperatedString(gvaV0ValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_V1.ordinal(), + makeSeperatedString(gvaV1ValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_V2.ordinal(), + makeSeperatedString(gvaV2ValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_V3.ordinal(), + makeSeperatedString(gvaV3ValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_ENABLED.ordinal(), + makeSeperatedString(gvaEnabledValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_SIZE.ordinal(), + makeSeperatedString(gvaSizeValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_TYPE.ordinal(), + makeSeperatedString(gvaTypeValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_NORMAL.ordinal(), + makeSeperatedString(gvaNormalValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_STRIDE.ordinal(), + makeSeperatedString(gvaStrideValueList)); + currentContextValueList.set(GLContextDBEnum.GVA_POINTER.ordinal(), + makeSeperatedString(gvaPointerValueList)); GLContextTreeTable.getInstance().initGVA(maxVertexAttribs); - + /* texture unit */ - for(int i = 0; i < maxTextureUnits; i++) { + for (int i = 0; i < maxTextureUnits; i++) { textureUnit2dValueList.add(ZERO); textureUnitCubeValueList.add(ZERO); } - currentContextValueList.set(GLContextDBEnum.TEXTURE_UNIT_2D.ordinal(), makeSeperatedString(textureUnit2dValueList)); - currentContextValueList.set(GLContextDBEnum.TEXTURE_UNIT_CUBE.ordinal(), makeSeperatedString(textureUnitCubeValueList)); + currentContextValueList.set( + GLContextDBEnum.TEXTURE_UNIT_2D.ordinal(), + makeSeperatedString(textureUnit2dValueList)); + currentContextValueList.set( + GLContextDBEnum.TEXTURE_UNIT_CUBE.ordinal(), + makeSeperatedString(textureUnitCubeValueList)); GLContextTreeTable.getInstance().initTextureUnit(maxTextureUnits); } else if (apiType == API_TYPE_CONTEXT && errorNo == 0) { currentContextValueList.clearSetIndexList(); int involvedIndex1 = -1; int involvedIndex2 = -1; - + String parameters[] = parameter.split(COMMA + SPACE); String contextValues[] = logData.getContextValue().split(COMMA); - if (apiName.equals(API_SGL_SWAPBUFFERS) || apiName.equals(API_EGL_SWAPBUFFERS)) { - GLFrameData currentFrameData = glFrameDataList.get(currentFrameIndex); + if (apiName.equals(API_SGL_SWAPBUFFERS) + || apiName.equals(API_EGL_SWAPBUFFERS)) { + GLFrameData currentFrameData = glFrameDataList + .get(currentFrameIndex); int frameNumber = currentFrameData.getFrameNumber(); GLFPSChart.getInstance().addData(frameNumber, @@ -487,167 +545,259 @@ public class GLDataMaker { if (time >= frameCountInfoList.size()) { int size = time - frameCountInfoList.size(); for (int i = 0; i <= size; i++) { - frameCountInfoList.add(new FrameCountInfo(currentFrameIndex)); + frameCountInfoList.add(new FrameCountInfo( + currentFrameIndex)); } } - + frameCountInfoList.get(time).addFrameCount(); - + glFrameDataList.add(new GLFrameData(++currentFrameIndex)); } else if (apiName.equals(API_GL_BLEND_COLOR)) { - setContextValueList(seq, GLContextDBEnum.BLEND_COLOR.ordinal(), parameters[0]+COMMA+parameters[1]+COMMA+parameters[2]+COMMA+parameters[3]); - } else if(apiName.equals(API_GL_BLEND_EQ)) { - setContextValueList(seq, GLContextDBEnum.BLEND_RGB_EQ.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.BLEND_A_EQ.ordinal(), GLConstantMap.getConstantString(parameters[0])); - } else if(apiName.equals(API_GL_BLEND_EQ_SEP)) { - setContextValueList(seq, GLContextDBEnum.BLEND_RGB_EQ.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.BLEND_A_EQ.ordinal(), GLConstantMap.getConstantString(parameters[1])); - } else if(apiName.equals(API_GL_BLEND_FUNC)) { - setContextValueList(seq, GLContextDBEnum.BLEND_SRC_RGB.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.BLEND_SRC_A.ordinal(), GLConstantMap.getConstantString(parameters[1])); - - setContextValueList(seq, GLContextDBEnum.BLEND_DEST_RGB.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.BLEND_DEST_A.ordinal(), GLConstantMap.getConstantString(parameters[1])); - } else if(apiName.equals(API_GL_BLEND_FUNC_SEP)) { - setContextValueList(seq, GLContextDBEnum.BLEND_SRC_RGB.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.BLEND_DEST_RGB.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.BLEND_SRC_A.ordinal(), GLConstantMap.getConstantString(parameters[2])); - setContextValueList(seq, GLContextDBEnum.BLEND_DEST_A.ordinal(), GLConstantMap.getConstantString(parameters[3])); - } else if(apiName.equals(API_GL_BUFFER_GEN)) { + setContextValueList(seq, GLContextDBEnum.BLEND_COLOR.ordinal(), + parameters[0] + COMMA + parameters[1] + COMMA + + parameters[2] + COMMA + parameters[3]); + } else if (apiName.equals(API_GL_BLEND_EQ)) { + setContextValueList(seq, + GLContextDBEnum.BLEND_RGB_EQ.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, GLContextDBEnum.BLEND_A_EQ.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + } else if (apiName.equals(API_GL_BLEND_EQ_SEP)) { + setContextValueList(seq, + GLContextDBEnum.BLEND_RGB_EQ.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, GLContextDBEnum.BLEND_A_EQ.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + } else if (apiName.equals(API_GL_BLEND_FUNC)) { + setContextValueList(seq, + GLContextDBEnum.BLEND_SRC_RGB.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, GLContextDBEnum.BLEND_SRC_A.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + + setContextValueList(seq, + GLContextDBEnum.BLEND_DEST_RGB.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.BLEND_DEST_A.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + } else if (apiName.equals(API_GL_BLEND_FUNC_SEP)) { + setContextValueList(seq, + GLContextDBEnum.BLEND_SRC_RGB.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.BLEND_DEST_RGB.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, GLContextDBEnum.BLEND_SRC_A.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + setContextValueList(seq, + GLContextDBEnum.BLEND_DEST_A.ordinal(), + GLConstantMap.getConstantString(parameters[3])); + } else if (apiName.equals(API_GL_BUFFER_GEN)) { int num = Integer.parseInt(parameters[0]); - + for (int i = 0; i < num; i++) { vboIDMap.put(contextValues[i], contextValues[i]); vboSizeMap.put(contextValues[i], "0"); vboDataMap.put(contextValues[i], "?"); vboUsageMap.put(contextValues[i], "GL_STATIC_DRAW"); } - - setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), makeSeperatedString(vboIDMap)); - setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), makeSeperatedString(vboSizeMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), makeSeperatedString(vboDataMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), makeSeperatedString(vboUsageMap)); - } else if(apiName.equals(API_GL_BUFFER_DEL)) { + + setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), + makeSeperatedString(vboIDMap)); + setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), + makeSeperatedString(vboSizeMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), + makeSeperatedString(vboDataMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), + makeSeperatedString(vboUsageMap)); + } else if (apiName.equals(API_GL_BUFFER_DEL)) { int num = Integer.parseInt(parameters[0]); - + for (int i = 0; i < num; i++) { vboIDMap.remove(contextValues[i]); vboSizeMap.remove(contextValues[i]); vboDataMap.remove(contextValues[i]); vboUsageMap.remove(contextValues[i]); } - - setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), makeSeperatedString(vboIDMap)); - setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), makeSeperatedString(vboSizeMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), makeSeperatedString(vboDataMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), makeSeperatedString(vboUsageMap)); - } else if(apiName.equals(API_GL_BUFFER_BIND)) { - if(GLConstantMap.getConstantString(parameters[0]).equals("GL_ARRAY_BUFFER")) { + + setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), + makeSeperatedString(vboIDMap)); + setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), + makeSeperatedString(vboSizeMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), + makeSeperatedString(vboDataMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), + makeSeperatedString(vboUsageMap)); + } else if (apiName.equals(API_GL_BUFFER_BIND)) { + if (GLConstantMap.getConstantString(parameters[0]).equals( + "GL_ARRAY_BUFFER")) { vboBindingArray = parameters[1]; } else { vboBindingElementArray = parameters[1]; } - setContextValueList(seq, GLContextDBEnum.VBO_BINDING.ordinal(), vboBindingArray + "/" + vboBindingElementArray); - } else if(apiName.equals(API_GL_BUFFER_DATA)) { + setContextValueList(seq, GLContextDBEnum.VBO_BINDING.ordinal(), + vboBindingArray + "/" + vboBindingElementArray); + } else if (apiName.equals(API_GL_BUFFER_DATA)) { String vboId; - if(GLConstantMap.getConstantString(parameters[0]).equals("GL_ARRAY_BUFFER")) { + if (GLConstantMap.getConstantString(parameters[0]).equals( + "GL_ARRAY_BUFFER")) { vboId = vboBindingArray; } else { vboId = vboBindingElementArray; } vboSizeMap.put(vboId, parameters[1]); vboDataMap.put(vboId, "?"); - vboUsageMap.put(vboId, GLConstantMap.getConstantString(parameters[3])); - - setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), makeSeperatedString(vboIDMap)); - setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), makeSeperatedString(vboSizeMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), makeSeperatedString(vboDataMap)); - setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), makeSeperatedString(vboUsageMap)); - } else if(apiName.equals(API_GL_CULLFACE)) { - setContextValueList(seq, GLContextDBEnum.CULLING_MODE.ordinal(), parameters[0]); - } else if(apiName.equals(API_GL_DEPTH_FUNC)) { - setContextValueList(seq, GLContextDBEnum.DEPTH_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - } else if(apiName.equals(API_GL_DEPTH_RANGEF)) { - setContextValueList(seq, GLContextDBEnum.DEPTH_RANGE_N.ordinal(), parameters[0]); - setContextValueList(seq, GLContextDBEnum.DEPTH_RANGE_F.ordinal(), parameters[1]); - } else if(apiName.equals(API_GL_DISABLE_VAA)) { + vboUsageMap.put(vboId, + GLConstantMap.getConstantString(parameters[3])); + + setContextValueList(seq, GLContextDBEnum.VBO_ID.ordinal(), + makeSeperatedString(vboIDMap)); + setContextValueList(seq, GLContextDBEnum.VBO_SIZE.ordinal(), + makeSeperatedString(vboSizeMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Data.ordinal(), + makeSeperatedString(vboDataMap)); + setContextValueList(seq, GLContextDBEnum.VBO_Usage.ordinal(), + makeSeperatedString(vboUsageMap)); + } else if (apiName.equals(API_GL_CULLFACE)) { + setContextValueList(seq, + GLContextDBEnum.CULLING_MODE.ordinal(), parameters[0]); + } else if (apiName.equals(API_GL_DEPTH_FUNC)) { + setContextValueList(seq, GLContextDBEnum.DEPTH_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + } else if (apiName.equals(API_GL_DEPTH_RANGEF)) { + setContextValueList(seq, + GLContextDBEnum.DEPTH_RANGE_N.ordinal(), parameters[0]); + setContextValueList(seq, + GLContextDBEnum.DEPTH_RANGE_F.ordinal(), parameters[1]); + } else if (apiName.equals(API_GL_DISABLE_VAA)) { involvedIndex1 = Integer.parseInt(parameter); gvaEnabledValueList.set(involvedIndex1, DISABLED); - setContextValueList(seq, GLContextDBEnum.GVA_ENABLED.ordinal(), makeSeperatedString(gvaEnabledValueList)); - } else if(apiName.equals(API_GL_ENABLE)) { - if(parameter.equals(GL_BLEND)) { - setContextValueList(seq, GLContextDBEnum.BLEND_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_CULL_FACE)) { - setContextValueList(seq, GLContextDBEnum.CULLING_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_DEPTH_TEST)) { - setContextValueList(seq, GLContextDBEnum.DEPTH_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_DITHER)) { - setContextValueList(seq, GLContextDBEnum.DITHER_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_POLYGON_OFFSET_FILL)) { - setContextValueList(seq, GLContextDBEnum.POLY_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_SCISSOR_TEST)) { - setContextValueList(seq, GLContextDBEnum.SCISSOR_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); - } else if(parameter.equals(GL_STENCIL_TEST)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_ENABLED.ordinal(), GLPageLabels.GL_CONTEXT_ENABLED); + setContextValueList(seq, GLContextDBEnum.GVA_ENABLED.ordinal(), + makeSeperatedString(gvaEnabledValueList)); + } else if (apiName.equals(API_GL_ENABLE)) { + if (parameter.equals(GL_BLEND)) { + setContextValueList(seq, + GLContextDBEnum.BLEND_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_CULL_FACE)) { + setContextValueList(seq, + GLContextDBEnum.CULLING_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_DEPTH_TEST)) { + setContextValueList(seq, + GLContextDBEnum.DEPTH_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_DITHER)) { + setContextValueList(seq, + GLContextDBEnum.DITHER_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_POLYGON_OFFSET_FILL)) { + setContextValueList(seq, + GLContextDBEnum.POLY_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_SCISSOR_TEST)) { + setContextValueList(seq, + GLContextDBEnum.SCISSOR_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); + } else if (parameter.equals(GL_STENCIL_TEST)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_ENABLED.ordinal(), + GLPageLabels.GL_CONTEXT_ENABLED); } - } else if(apiName.equals(API_GL_ENABLE_VAA)) { + } else if (apiName.equals(API_GL_ENABLE_VAA)) { involvedIndex1 = Integer.parseInt(parameter); gvaEnabledValueList.set(involvedIndex1, ENABLED); - setContextValueList(seq, GLContextDBEnum.GVA_ENABLED.ordinal(), makeSeperatedString(gvaEnabledValueList)); - } else if(apiName.equals(API_GL_FRONTFACE)) { - setContextValueList(seq, GLContextDBEnum.CULLING_ORI.ordinal(), GLConstantMap.getConstantString(parameters[0])); - } else if(apiName.equals(API_GL_LINEWIDTH)) { - setContextValueList(seq, GLContextDBEnum.LINE_W.ordinal(), parameters[0]); - } else if(apiName.equals(API_GL_PIXEL_STOREI)) { - if(parameters[0].equals(GL_PACK_ALIGNMENT)) { - setContextValueList(seq, GLContextDBEnum.PACK_ALIGN.ordinal(), GLConstantMap.getConstantString(parameters[1])); - } else if(parameters[0].equals(GL_UNPACK_ALIGNMENT)) { - setContextValueList(seq, GLContextDBEnum.UNPACK_ALIGN.ordinal(), GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, GLContextDBEnum.GVA_ENABLED.ordinal(), + makeSeperatedString(gvaEnabledValueList)); + } else if (apiName.equals(API_GL_FRONTFACE)) { + setContextValueList(seq, GLContextDBEnum.CULLING_ORI.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + } else if (apiName.equals(API_GL_LINEWIDTH)) { + setContextValueList(seq, GLContextDBEnum.LINE_W.ordinal(), + parameters[0]); + } else if (apiName.equals(API_GL_PIXEL_STOREI)) { + if (parameters[0].equals(GL_PACK_ALIGNMENT)) { + setContextValueList(seq, + GLContextDBEnum.PACK_ALIGN.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + } else if (parameters[0].equals(GL_UNPACK_ALIGNMENT)) { + setContextValueList(seq, + GLContextDBEnum.UNPACK_ALIGN.ordinal(), + GLConstantMap.getConstantString(parameters[1])); } - } else if(apiName.equals(API_GL_PROGRAM_CREATE)) { + } else if (apiName.equals(API_GL_PROGRAM_CREATE)) { String programID = String.valueOf(logData.getReturn()); programIDMap.put(programID, programID); programVShaderMap.put(programID, EMPTY); programFShaderMap.put(programID, EMPTY); - + involvedIndex1 = programIDMap.size() - 1; - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_ID.ordinal(), makeSeperatedString(programIDMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), makeSeperatedString(programVShaderMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), makeSeperatedString(programFShaderMap)); - } else if(apiName.equals(API_GL_PROGRAM_DEL)) { + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_ID.ordinal(), + makeSeperatedString(programIDMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), + makeSeperatedString(programVShaderMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), + makeSeperatedString(programFShaderMap)); + } else if (apiName.equals(API_GL_PROGRAM_DEL)) { programIDMap.remove(parameter); programVShaderMap.remove(parameter); programFShaderMap.remove(parameter); - - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_ID.ordinal(), makeSeperatedString(programIDMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), makeSeperatedString(programVShaderMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), makeSeperatedString(programFShaderMap)); + + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_ID.ordinal(), + makeSeperatedString(programIDMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), + makeSeperatedString(programVShaderMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), + makeSeperatedString(programFShaderMap)); } else if (apiName.equals(API_GL_PROGRAM_LINK)) { String programID = parameter; int contextValueIndex = 0; if (contextValues.length > 0) { - int attribNum = Integer.parseInt(contextValues[contextValueIndex++]); + int attribNum = Integer + .parseInt(contextValues[contextValueIndex++]); for (int i = 0; i < attribNum; i++) { String index = contextValues[contextValueIndex++]; String name = contextValues[contextValueIndex++]; String size = contextValues[contextValueIndex++]; - String type = GLConstantMap.getConstantString(contextValues[contextValueIndex++]); + String type = GLConstantMap + .getConstantString(contextValues[contextValueIndex++]); - putMapValue(programAttribIndexMap, programID, index, index); - putMapValue(programAttribNameMap, programID, name, index); - putMapValue(programAttribSizeMap, programID, size, index); - putMapValue(programAttribTypeMap, programID, type, index); + putMapValue(programAttribIndexMap, programID, index, + index); + putMapValue(programAttribNameMap, programID, name, + index); + putMapValue(programAttribSizeMap, programID, size, + index); + putMapValue(programAttribTypeMap, programID, type, + index); } - + involvedIndex1 = getIndexByKey(programIDMap, programID); - setContextValueList(seq, GLContextDBEnum.PROGRAM_ATTRIB_INDEX.ordinal(), makeSeperatedString2(programAttribIndexMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_ATTRIB_NAME.ordinal(), makeSeperatedString2(programAttribNameMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_ATTRIB_SIZE.ordinal(), makeSeperatedString2(programAttribSizeMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_ATTRIB_TYPE.ordinal(), makeSeperatedString2(programAttribTypeMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_ATTRIB_INDEX.ordinal(), + makeSeperatedString2(programAttribIndexMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_ATTRIB_NAME.ordinal(), + makeSeperatedString2(programAttribNameMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_ATTRIB_SIZE.ordinal(), + makeSeperatedString2(programAttribSizeMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_ATTRIB_TYPE.ordinal(), + makeSeperatedString2(programAttribTypeMap)); } - + if (contextValues.length > 0) { - int uniformNum = Integer.parseInt(contextValues[contextValueIndex++]); + int uniformNum = Integer + .parseInt(contextValues[contextValueIndex++]); for (int i = 0; i < uniformNum; i++) { String index = contextValues[contextValueIndex++]; String name = contextValues[contextValueIndex++]; @@ -655,71 +805,110 @@ public class GLDataMaker { String type = GLConstantMap .getConstantString(contextValues[contextValueIndex++]); - putMapValue(programUniformIndexMap, programID, index, index); - putMapValue(programUniformNameMap, programID, name, index); - putMapValue(programUniformSizeMap, programID, size, index); - putMapValue(programUniformTypeMap, programID, type, index); + putMapValue(programUniformIndexMap, programID, index, + index); + putMapValue(programUniformNameMap, programID, name, + index); + putMapValue(programUniformSizeMap, programID, size, + index); + putMapValue(programUniformTypeMap, programID, type, + index); } - + involvedIndex1 = getIndexByKey(programIDMap, programID); - setContextValueList(seq, GLContextDBEnum.PROGRAM_UNIFORM_INDEX.ordinal(), makeSeperatedString2(programUniformIndexMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_UNIFORM_NAME.ordinal(), makeSeperatedString2(programUniformNameMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_UNIFORM_SIZE.ordinal(), makeSeperatedString2(programUniformSizeMap)); - setContextValueList(seq, GLContextDBEnum.PROGRAM_UNIFORM_TYPE.ordinal(), makeSeperatedString2(programUniformTypeMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_UNIFORM_INDEX.ordinal(), + makeSeperatedString2(programUniformIndexMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_UNIFORM_NAME.ordinal(), + makeSeperatedString2(programUniformNameMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_UNIFORM_SIZE.ordinal(), + makeSeperatedString2(programUniformSizeMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_UNIFORM_TYPE.ordinal(), + makeSeperatedString2(programUniformTypeMap)); } - } else if(apiName.equals(API_GL_PROGRAM_USE)) { - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_CURRENT.ordinal(), parameter); - } else if(apiName.equals(API_GL_PROGRAM_ATTACH_SHADER)) { + } else if (apiName.equals(API_GL_PROGRAM_USE)) { + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_CURRENT.ordinal(), + parameter); + } else if (apiName.equals(API_GL_PROGRAM_ATTACH_SHADER)) { String programID = parameters[0]; String shaderID = parameters[1]; involvedIndex1 = getIndexByKey(programIDMap, programID); - - if(shaderTypeMap.get(shaderID).equals("GL_VERTEX_SHADER")) { + + if (shaderTypeMap.get(shaderID).equals("GL_VERTEX_SHADER")) { programVShaderMap.put(programID, shaderID); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), makeSeperatedString(programVShaderMap)); - } else if (shaderTypeMap.get(shaderID).equals("GL_FRAGMENT_SHADER")) { + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), + makeSeperatedString(programVShaderMap)); + } else if (shaderTypeMap.get(shaderID).equals( + "GL_FRAGMENT_SHADER")) { programFShaderMap.put(programID, shaderID); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), makeSeperatedString(programFShaderMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), + makeSeperatedString(programFShaderMap)); } } else if (apiName.equals(API_GL_PROGRAM_DETATCH_SHADER)) { String programID = parameters[0]; String shaderID = parameters[1]; involvedIndex1 = getIndexByKey(programIDMap, programID); - + if (programVShaderMap.get(programID).equals(shaderID)) { programVShaderMap.put(programID, EMPTY); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), makeSeperatedString(programVShaderMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_V_SHADER.ordinal(), + makeSeperatedString(programVShaderMap)); } else if (programFShaderMap.get(programID).equals(shaderID)) { programFShaderMap.put(programID, EMPTY); - setContextValueList(seq, GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), makeSeperatedString(programFShaderMap)); + setContextValueList(seq, + GLContextDBEnum.PROGRAM_OBJ_F_SHADER.ordinal(), + makeSeperatedString(programFShaderMap)); } } else if (apiName.equals(API_GL_POLY_OFFSET)) { - setContextValueList(seq, GLContextDBEnum.POLY_FACTOR.ordinal(), parameters[0]); - setContextValueList(seq, GLContextDBEnum.POLY_UNITS.ordinal(), parameters[1]); - } else if(apiName.equals(API_GL_SCISSOR)) { - setContextValueList(seq, GLContextDBEnum.SCISSOR_X.ordinal(), parameters[0]); - setContextValueList(seq, GLContextDBEnum.SCISSOR_Y.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.SCISSOR_W.ordinal(), parameters[2]); - setContextValueList(seq, GLContextDBEnum.SCISSOR_H.ordinal(), parameters[3]); - } else if(apiName.equals(API_GL_SHADER_CREATE)) { + setContextValueList(seq, GLContextDBEnum.POLY_FACTOR.ordinal(), + parameters[0]); + setContextValueList(seq, GLContextDBEnum.POLY_UNITS.ordinal(), + parameters[1]); + } else if (apiName.equals(API_GL_SCISSOR)) { + setContextValueList(seq, GLContextDBEnum.SCISSOR_X.ordinal(), + parameters[0]); + setContextValueList(seq, GLContextDBEnum.SCISSOR_Y.ordinal(), + parameters[1]); + setContextValueList(seq, GLContextDBEnum.SCISSOR_W.ordinal(), + parameters[2]); + setContextValueList(seq, GLContextDBEnum.SCISSOR_H.ordinal(), + parameters[3]); + } else if (apiName.equals(API_GL_SHADER_CREATE)) { String shaderID = logData.getReturn(); shaderIDMap.put(shaderID, shaderID); - shaderTypeMap.put(shaderID, GLConstantMap.getConstantString(parameter)); + shaderTypeMap.put(shaderID, + GLConstantMap.getConstantString(parameter)); shaderSourceMap.put(shaderID, SPACE); involvedIndex1 = shaderIDMap.size() - 1; - - setContextValueList(seq, GLContextDBEnum.SHADER_OBJ_ID.ordinal(), makeSeperatedString(shaderIDMap)); - setContextValueList(seq, GLContextDBEnum.SHADER_TYPE.ordinal(), makeSeperatedString(shaderTypeMap)); - currentContextValueList.originalSet(GLContextDBEnum.SHADER_SRC.ordinal(), makeSeperatedString(shaderSourceMap)); - } else if(apiName.equals(API_GL_SHADER_DEL)) { + + setContextValueList(seq, + GLContextDBEnum.SHADER_OBJ_ID.ordinal(), + makeSeperatedString(shaderIDMap)); + setContextValueList(seq, GLContextDBEnum.SHADER_TYPE.ordinal(), + makeSeperatedString(shaderTypeMap)); + currentContextValueList.originalSet( + GLContextDBEnum.SHADER_SRC.ordinal(), + makeSeperatedString(shaderSourceMap)); + } else if (apiName.equals(API_GL_SHADER_DEL)) { shaderIDMap.remove(parameter); shaderTypeMap.remove(parameter); shaderSourceMap.remove(parameter); - - setContextValueList(seq, GLContextDBEnum.SHADER_OBJ_ID.ordinal(), makeSeperatedString(shaderIDMap)); - setContextValueList(seq, GLContextDBEnum.SHADER_TYPE.ordinal(), makeSeperatedString(shaderTypeMap)); - setContextValueList(seq, GLContextDBEnum.SHADER_SRC.ordinal(), makeSeperatedString(shaderSourceMap)); - } else if(apiName.equals(API_GL_SHADER_SOURCE)) { + + setContextValueList(seq, + GLContextDBEnum.SHADER_OBJ_ID.ordinal(), + makeSeperatedString(shaderIDMap)); + setContextValueList(seq, GLContextDBEnum.SHADER_TYPE.ordinal(), + makeSeperatedString(shaderTypeMap)); + setContextValueList(seq, GLContextDBEnum.SHADER_SRC.ordinal(), + makeSeperatedString(shaderSourceMap)); + } else if (apiName.equals(API_GL_SHADER_SOURCE)) { shaderSourceMap.put(parameters[0], logData.getContextValue()); int i = 0; @@ -730,91 +919,185 @@ public class GLDataMaker { } i++; } - setContextValueList(seq, GLContextDBEnum.SHADER_SRC.ordinal(), makeSeperatedString(shaderSourceMap)); - } else if(apiName.equals(API_GL_STENCIL_FUNC)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), parameters[2]); - - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), parameters[2]); - } else if(apiName.equals(API_GL_STENCIL_FUNC_SEP)) { - if(parameters[0].equals(GL_FRONT)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), parameters[2]); - } else if(parameters[0].equals(GL_BACK)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), parameters[2]); - } else if(parameters[0].equals(GL_FRONT_AND_BACK)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), parameters[2]); - - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_REF.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), parameters[2]); + setContextValueList(seq, GLContextDBEnum.SHADER_SRC.ordinal(), + makeSeperatedString(shaderSourceMap)); + } else if (apiName.equals(API_GL_STENCIL_FUNC)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), + parameters[2]); + + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), + parameters[2]); + } else if (apiName.equals(API_GL_STENCIL_FUNC_SEP)) { + if (parameters[0].equals(GL_FRONT)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), + parameters[2]); + } else if (parameters[0].equals(GL_BACK)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), + parameters[2]); + } else if (parameters[0].equals(GL_FRONT_AND_BACK)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_MASK.ordinal(), + parameters[2]); + + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_FUNC.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_REF.ordinal(), + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_MASK.ordinal(), + parameters[2]); } - } else if(apiName.equals(API_GL_STENCIL_OP)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); - - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); - } else if(apiName.equals(API_GL_STENCIL_OP_SEP)) { - if(apiName.equals(GL_FRONT)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); - } else if(apiName.equals(GL_BACK)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); - } else if(apiName.equals(GL_FRONT_AND_BACK)) { - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); - - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[0])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), GLConstantMap.getConstantString(parameters[1])); - setContextValueList(seq, GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), GLConstantMap.getConstantString(parameters[2])); + } else if (apiName.equals(API_GL_STENCIL_OP)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + } else if (apiName.equals(API_GL_STENCIL_OP_SEP)) { + if (apiName.equals(GL_FRONT)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + } else if (apiName.equals(GL_BACK)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + } else if (apiName.equals(GL_FRONT_AND_BACK)) { + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_FRONT_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); + + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_S_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[0])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_FAIL.ordinal(), + GLConstantMap.getConstantString(parameters[1])); + setContextValueList(seq, + GLContextDBEnum.STENCIL_BACK_D_PASS.ordinal(), + GLConstantMap.getConstantString(parameters[2])); } - } else if(apiName.equals(API_GL_TEXTURE_ACTIVE)) { - setContextValueList(seq, GLContextDBEnum.TEXTURE_ACTIVE.ordinal(), GLConstantMap.getConstantString(parameters[0])); + } else if (apiName.equals(API_GL_TEXTURE_ACTIVE)) { + setContextValueList(seq, + GLContextDBEnum.TEXTURE_ACTIVE.ordinal(), + GLConstantMap.getConstantString(parameters[0])); } else if (apiName.equals(API_GL_TEXTURE_BIND)) { - int activeTextureUnit = Integer.parseInt( - currentContextValueList.get(GLContextDBEnum.TEXTURE_ACTIVE.ordinal()).split("GL_TEXTURE")[1]); + int activeTextureUnit = Integer + .parseInt(currentContextValueList.get( + GLContextDBEnum.TEXTURE_ACTIVE.ordinal()) + .split("GL_TEXTURE")[1]); involvedIndex1 = activeTextureUnit; if (parameters[0].equals(GL_TEXTURE_2D)) { - textureUnit2dValueList.set(activeTextureUnit, parameters[1]); - setContextValueList(seq, GLContextDBEnum.TEXTURE_UNIT_2D.ordinal(), makeSeperatedString(textureUnit2dValueList)); + textureUnit2dValueList + .set(activeTextureUnit, parameters[1]); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_UNIT_2D.ordinal(), + makeSeperatedString(textureUnit2dValueList)); } else if (parameters[0].equals(GL_TEXTURE_CUBE_MAP)) { - textureUnitCubeValueList.set(activeTextureUnit, parameters[1]); - setContextValueList(seq, GLContextDBEnum.TEXTURE_UNIT_CUBE.ordinal(), makeSeperatedString(textureUnitCubeValueList)); + textureUnitCubeValueList.set(activeTextureUnit, + parameters[1]); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_UNIT_CUBE.ordinal(), + makeSeperatedString(textureUnitCubeValueList)); } - } else if(apiName.equals(API_GL_TEXTURE_GEN)) { + } else if (apiName.equals(API_GL_TEXTURE_GEN)) { int num = Integer.parseInt(parameters[0]); - + for (int i = 0; i < num; i++) { textureObjIDMap.put(contextValues[i], contextValues[i]); textureObjMagFuncMap.put(contextValues[i], "GL_LINEAR"); - textureObjMinFuncMap.put(contextValues[i], "GL_NEAREST_MIPMAP_LINEAR"); + textureObjMinFuncMap.put(contextValues[i], + "GL_NEAREST_MIPMAP_LINEAR"); textureObjWrapSMap.put(contextValues[i], "GL_REPEAT"); textureObjWrapTMap.put(contextValues[i], "GL_REPEAT"); } - - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_ID.ordinal(), makeSeperatedString(textureObjIDMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), makeSeperatedString(textureObjMagFuncMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), makeSeperatedString(textureObjMinFuncMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), makeSeperatedString(textureObjWrapSMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), makeSeperatedString(textureObjWrapTMap)); - } else if(apiName.equals(API_GL_TEXTURE_DEL)) { + + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_ID.ordinal(), + makeSeperatedString(textureObjIDMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), + makeSeperatedString(textureObjMagFuncMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), + makeSeperatedString(textureObjMinFuncMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), + makeSeperatedString(textureObjWrapSMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), + makeSeperatedString(textureObjWrapTMap)); + } else if (apiName.equals(API_GL_TEXTURE_DEL)) { int num = Integer.parseInt(parameters[0]); - + for (int i = 0; i < num; i++) { textureObjIDMap.remove(contextValues[i]); textureObjMagFuncMap.remove(contextValues[i]); @@ -822,126 +1105,194 @@ public class GLDataMaker { textureObjWrapSMap.remove(contextValues[i]); textureObjWrapTMap.remove(contextValues[i]); } - - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_ID.ordinal(), makeSeperatedString(textureObjIDMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), makeSeperatedString(textureObjMagFuncMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), makeSeperatedString(textureObjMinFuncMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), makeSeperatedString(textureObjWrapSMap)); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), makeSeperatedString(textureObjWrapTMap)); - } else if(apiName.equals(API_GL_TEXTURE_PARAM_F) || - apiName.equals(API_GL_TEXTURE_PARAM_I)) { + + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_ID.ordinal(), + makeSeperatedString(textureObjIDMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), + makeSeperatedString(textureObjMagFuncMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), + makeSeperatedString(textureObjMinFuncMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), + makeSeperatedString(textureObjWrapSMap)); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), + makeSeperatedString(textureObjWrapTMap)); + } else if (apiName.equals(API_GL_TEXTURE_PARAM_F) + || apiName.equals(API_GL_TEXTURE_PARAM_I)) { String textureObjID; - int activeTextureUnit = Integer.parseInt( - currentContextValueList.get(GLContextDBEnum.TEXTURE_ACTIVE.ordinal()).split("GL_TEXTURE")[1]); - if(parameters[0].equals(GL_TEXTURE_2D)) { - textureObjID = textureUnit2dValueList.get(activeTextureUnit); + int activeTextureUnit = Integer + .parseInt(currentContextValueList.get( + GLContextDBEnum.TEXTURE_ACTIVE.ordinal()) + .split("GL_TEXTURE")[1]); + if (parameters[0].equals(GL_TEXTURE_2D)) { + textureObjID = textureUnit2dValueList + .get(activeTextureUnit); } else { - textureObjID = textureUnitCubeValueList.get(activeTextureUnit); + textureObjID = textureUnitCubeValueList + .get(activeTextureUnit); } - + involvedIndex1 = getIndexByKey(textureObjIDMap, textureObjID); - - if(parameters[1].equals(GL_TEXTURE_MAG_FILTER)) { - textureObjMagFuncMap.put(textureObjID, GLConstantMap.getConstantString(parameters[2])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), makeSeperatedString(textureObjMagFuncMap)); + + if (parameters[1].equals(GL_TEXTURE_MAG_FILTER)) { + textureObjMagFuncMap.put(textureObjID, + GLConstantMap.getConstantString(parameters[2])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), + makeSeperatedString(textureObjMagFuncMap)); } else if (parameters[1].equals(GL_TEXTURE_MIN_FILTER)) { - textureObjMinFuncMap.put(textureObjID, GLConstantMap.getConstantString(parameters[2])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), makeSeperatedString(textureObjMinFuncMap)); + textureObjMinFuncMap.put(textureObjID, + GLConstantMap.getConstantString(parameters[2])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), + makeSeperatedString(textureObjMinFuncMap)); } else if (parameters[1].equals(GL_TEXTURE_WRAP_S)) { - textureObjWrapSMap.put(textureObjID, GLConstantMap.getConstantString(parameters[2])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), makeSeperatedString(textureObjWrapSMap)); + textureObjWrapSMap.put(textureObjID, + GLConstantMap.getConstantString(parameters[2])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), + makeSeperatedString(textureObjWrapSMap)); } else if (parameters[1].equals(GL_TEXTURE_WRAP_T)) { - textureObjWrapTMap.put(textureObjID, GLConstantMap.getConstantString(parameters[2])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), makeSeperatedString(textureObjWrapTMap)); + textureObjWrapTMap.put(textureObjID, + GLConstantMap.getConstantString(parameters[2])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), + makeSeperatedString(textureObjWrapTMap)); } - } else if(apiName.equals(API_GL_TEXTURE_PARAM_FV) || - apiName.equals(API_GL_TEXTURE_PARAM_IV)) { - //TODO + } else if (apiName.equals(API_GL_TEXTURE_PARAM_FV) + || apiName.equals(API_GL_TEXTURE_PARAM_IV)) { + // TODO String textureObjID; - int activeTextureUnit = Integer.parseInt( - currentContextValueList.get(GLContextDBEnum.TEXTURE_ACTIVE.ordinal()).split("GL_TEXTURE")[1]); - if(parameters[0].equals(GL_TEXTURE_2D)) { - textureObjID = textureUnit2dValueList.get(activeTextureUnit); + int activeTextureUnit = Integer + .parseInt(currentContextValueList.get( + GLContextDBEnum.TEXTURE_ACTIVE.ordinal()) + .split("GL_TEXTURE")[1]); + if (parameters[0].equals(GL_TEXTURE_2D)) { + textureObjID = textureUnit2dValueList + .get(activeTextureUnit); } else { - textureObjID = textureUnitCubeValueList.get(activeTextureUnit); + textureObjID = textureUnitCubeValueList + .get(activeTextureUnit); } - + involvedIndex1 = getIndexByKey(textureObjIDMap, textureObjID); - - if(parameters[1].equals(GL_TEXTURE_MAG_FILTER)) { - textureObjMagFuncMap.put(textureObjID, GLConstantMap.getConstantString(contextValues[0])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), makeSeperatedString(textureObjMagFuncMap)); + + if (parameters[1].equals(GL_TEXTURE_MAG_FILTER)) { + textureObjMagFuncMap.put(textureObjID, + GLConstantMap.getConstantString(contextValues[0])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MAG_FUNC.ordinal(), + makeSeperatedString(textureObjMagFuncMap)); } else if (parameters[1].equals(GL_TEXTURE_MIN_FILTER)) { - textureObjMinFuncMap.put(textureObjID, GLConstantMap.getConstantString(contextValues[0])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), makeSeperatedString(textureObjMinFuncMap)); + textureObjMinFuncMap.put(textureObjID, + GLConstantMap.getConstantString(contextValues[0])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_MIN_FUNC.ordinal(), + makeSeperatedString(textureObjMinFuncMap)); } else if (parameters[1].equals(GL_TEXTURE_WRAP_S)) { - textureObjWrapSMap.put(textureObjID, GLConstantMap.getConstantString(contextValues[0])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), makeSeperatedString(textureObjWrapSMap)); + textureObjWrapSMap.put(textureObjID, + GLConstantMap.getConstantString(contextValues[0])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_S.ordinal(), + makeSeperatedString(textureObjWrapSMap)); } else if (parameters[1].equals(GL_TEXTURE_WRAP_T)) { - textureObjWrapTMap.put(textureObjID, GLConstantMap.getConstantString(contextValues[0])); - setContextValueList(seq, GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), makeSeperatedString(textureObjWrapTMap)); + textureObjWrapTMap.put(textureObjID, + GLConstantMap.getConstantString(contextValues[0])); + setContextValueList(seq, + GLContextDBEnum.TEXTURE_OBJ_WRAP_T.ordinal(), + makeSeperatedString(textureObjWrapTMap)); } - } else if(apiName.equals(API_GL_VERTEX_ATTRIB1F) || - apiName.equals(API_GL_VERTEX_ATTRIB2F) || - apiName.equals(API_GL_VERTEX_ATTRIB3F) || - apiName.equals(API_GL_VERTEX_ATTRIB4F) || - apiName.equals(API_GL_VERTEX_ATTRIB1FV) || - apiName.equals(API_GL_VERTEX_ATTRIB2FV) || - apiName.equals(API_GL_VERTEX_ATTRIB3FV) || - apiName.equals(API_GL_VERTEX_ATTRIB4FV)) { + } else if (apiName.equals(API_GL_VERTEX_ATTRIB1F) + || apiName.equals(API_GL_VERTEX_ATTRIB2F) + || apiName.equals(API_GL_VERTEX_ATTRIB3F) + || apiName.equals(API_GL_VERTEX_ATTRIB4F) + || apiName.equals(API_GL_VERTEX_ATTRIB1FV) + || apiName.equals(API_GL_VERTEX_ATTRIB2FV) + || apiName.equals(API_GL_VERTEX_ATTRIB3FV) + || apiName.equals(API_GL_VERTEX_ATTRIB4FV)) { // TODO IndexOutOfBoundsException involvedIndex1 = Integer.parseInt(parameters[0]); gvaV0ValueList.set(involvedIndex1, contextValues[0]); gvaV1ValueList.set(involvedIndex1, contextValues[1]); gvaV2ValueList.set(involvedIndex1, contextValues[2]); gvaV3ValueList.set(involvedIndex1, contextValues[3]); - setContextValueList(seq, GLContextDBEnum.GVA_V0.ordinal(), makeSeperatedString(gvaV0ValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_V1.ordinal(), makeSeperatedString(gvaV1ValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_V2.ordinal(), makeSeperatedString(gvaV2ValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_V3.ordinal(), makeSeperatedString(gvaV3ValueList)); - } else if(apiName.equals(API_GL_VERTEX_ATTRIB_POINTER)) { + setContextValueList(seq, GLContextDBEnum.GVA_V0.ordinal(), + makeSeperatedString(gvaV0ValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_V1.ordinal(), + makeSeperatedString(gvaV1ValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_V2.ordinal(), + makeSeperatedString(gvaV2ValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_V3.ordinal(), + makeSeperatedString(gvaV3ValueList)); + } else if (apiName.equals(API_GL_VERTEX_ATTRIB_POINTER)) { involvedIndex1 = Integer.parseInt(parameters[0]); gvaSizeValueList.set(involvedIndex1, parameters[1]); - gvaTypeValueList.set(involvedIndex1, GLConstantMap.getConstantString(parameters[2])); + gvaTypeValueList.set(involvedIndex1, + GLConstantMap.getConstantString(parameters[2])); gvaNormalValueList.set(involvedIndex1, parameters[3]); gvaStrideValueList.set(involvedIndex1, parameters[4]); gvaPointerValueList.set(involvedIndex1, parameters[5]); - setContextValueList(seq, GLContextDBEnum.GVA_SIZE.ordinal(), makeSeperatedString(gvaSizeValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_TYPE.ordinal(), makeSeperatedString(gvaTypeValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_NORMAL.ordinal(), makeSeperatedString(gvaNormalValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_STRIDE.ordinal(), makeSeperatedString(gvaStrideValueList)); - setContextValueList(seq, GLContextDBEnum.GVA_POINTER.ordinal(), makeSeperatedString(gvaPointerValueList)); - } else if(apiName.equals(API_GL_VIEWPORT)) { - setContextValueList(seq, GLContextDBEnum.VIEWPORT_X.ordinal(), parameters[0]); - setContextValueList(seq, GLContextDBEnum.VIEWPORT_Y.ordinal(), parameters[1]); - setContextValueList(seq, GLContextDBEnum.VIEWPORT_W.ordinal(), parameters[2]); - setContextValueList(seq, GLContextDBEnum.VIEWPORT_H.ordinal(), parameters[3]); - } - - currentContextValueList.set(GLContextDBEnum.INVOLVED_ORDINAL.ordinal(), makeSeperatedString(currentContextValueList.getSetIndexList())); - currentContextValueList.set(GLContextDBEnum.INVOLVED_INDEX1.ordinal(), String.valueOf(involvedIndex1)); - currentContextValueList.set(GLContextDBEnum.INVOLVED_INDEX2.ordinal(), String.valueOf(involvedIndex2)); + setContextValueList(seq, GLContextDBEnum.GVA_SIZE.ordinal(), + makeSeperatedString(gvaSizeValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_TYPE.ordinal(), + makeSeperatedString(gvaTypeValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_NORMAL.ordinal(), + makeSeperatedString(gvaNormalValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_STRIDE.ordinal(), + makeSeperatedString(gvaStrideValueList)); + setContextValueList(seq, GLContextDBEnum.GVA_POINTER.ordinal(), + makeSeperatedString(gvaPointerValueList)); + } else if (apiName.equals(API_GL_VIEWPORT)) { + setContextValueList(seq, GLContextDBEnum.VIEWPORT_X.ordinal(), + parameters[0]); + setContextValueList(seq, GLContextDBEnum.VIEWPORT_Y.ordinal(), + parameters[1]); + setContextValueList(seq, GLContextDBEnum.VIEWPORT_W.ordinal(), + parameters[2]); + setContextValueList(seq, GLContextDBEnum.VIEWPORT_H.ordinal(), + parameters[3]); + } + + currentContextValueList.set(GLContextDBEnum.INVOLVED_ORDINAL + .ordinal(), makeSeperatedString(currentContextValueList + .getSetIndexList())); + currentContextValueList.set( + GLContextDBEnum.INVOLVED_INDEX1.ordinal(), + String.valueOf(involvedIndex1)); + currentContextValueList.set( + GLContextDBEnum.INVOLVED_INDEX2.ordinal(), + String.valueOf(involvedIndex2)); } else { - currentContextValueList.set(GLContextDBEnum.INVOLVED_ORDINAL.ordinal(), EMPTY); - currentContextValueList.set(GLContextDBEnum.INVOLVED_INDEX1.ordinal(), EMPTY); - currentContextValueList.set(GLContextDBEnum.INVOLVED_INDEX2.ordinal(), EMPTY); + currentContextValueList.set( + GLContextDBEnum.INVOLVED_ORDINAL.ordinal(), EMPTY); + currentContextValueList.set( + GLContextDBEnum.INVOLVED_INDEX1.ordinal(), EMPTY); + currentContextValueList.set( + GLContextDBEnum.INVOLVED_INDEX2.ordinal(), EMPTY); } currentContextValueList.set(CONTEXT_VALUE_SIZE, seq); - currentContextValueList.set(GLContextDBEnum.FRAME_INDEX.ordinal(), String.valueOf(currentFrameIndex)); - contextValueDBInputList.add((List)currentContextValueList.clone()); + currentContextValueList.set(GLContextDBEnum.FRAME_INDEX.ordinal(), + String.valueOf(currentFrameIndex)); + contextValueDBInputList.add((List) currentContextValueList + .clone()); } private void setContextValueList(String seq, int index, String value) { - if(!currentContextValueList.get(index).equals(value)) { - contextValueChangeList.get(index).add(currentFrameIndex + DELIMITER + seq); + if (!currentContextValueList.get(index).equals(value)) { + contextValueChangeList.get(index).add( + currentFrameIndex + DELIMITER + seq); } - + contextValueSetList.get(index).add(currentFrameIndex + DELIMITER + seq); - + currentContextValueList.set(index, value); } - + public GLFrameData getFrameData(int index) { return glFrameDataList.get(index); } @@ -949,7 +1300,7 @@ public class GLDataMaker { public int getFrameSize() { return glFrameDataList.size(); } - + public List> getContextValueDAInputListAndClear() { @SuppressWarnings("unchecked") List> ret = (List>) contextValueDBInputList @@ -995,7 +1346,7 @@ public class GLDataMaker { sb.deleteCharAt(sb.length() - 1); return sb.toString(); } - + private String makeSeperatedString(LinkedHashMap map) { if (map.size() == 0) { return EMPTY; @@ -1012,19 +1363,18 @@ public class GLDataMaker { return sb.toString(); } - private int getIndexByKey(LinkedHashMap map, - String key) { + private int getIndexByKey(LinkedHashMap map, String key) { Set keySet = map.keySet(); Iterator iter = keySet.iterator(); int i = -1; - - while(iter.hasNext()) { + + while (iter.hasNext()) { i++; - if(iter.next().equals(key)) { + if (iter.next().equals(key)) { return i; } } - + return -1; } @@ -1041,28 +1391,52 @@ public class GLDataMaker { public FrameCountInfo getFrameCountInfo(int index) { return frameCountInfoList.get(index); } - + public int getFrameCountInfoListSize() { return frameCountInfoList.size(); } - + public int getFrameCountListIndex(int frameIndex) { int tempIndex = 0; - for(int i = 0; i < frameCountInfoList.size(); i++) { + for (int i = 0; i < frameCountInfoList.size(); i++) { tempIndex += frameCountInfoList.get(i).getFrameCount(); - if(tempIndex > frameIndex) { + if (tempIndex > frameIndex) { return i; } } - + return -1; } - + public ArrayList getContextValueChangeList(int columnIndex) { return contextValueChangeList.get(columnIndex); } - + public ArrayList getContextValueSetList(int columnIndex) { return contextValueSetList.get(columnIndex); } + + @Override + public void run() { + while (!AnalyzerManager.isExit()) { + LogPackage pack = pollPack(); + if(pack == null) // stop thread + break; + + Logs glesLogs = pack.getLogs(DataChannelConstants.MSG_PROBE_GLES20); + if (glesLogs != null && glesLogs.getRawLogs().size() != 0) { + List logDataList = glesLogs.getRawLogs(); + + for (LogData logData : logDataList) { + addGLAPIData((GLES20LogData) logData); + } + + GLContextDataInserter.getContextDataQueue().push( + getContextValueDAInputListAndClear()); + GLContextDataInserter.startinserterThread(); + } + } + + System.out.println(getName() + " thread ended!"); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLSelectionData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLSelectionData.java index 4749376..634fa05 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLSelectionData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLSelectionData.java @@ -33,6 +33,7 @@ public class GLSelectionData extends DASelectionData { private int frameIndex; private int secondFrameIndex = -1; private String seq; + private String subID; public GLSelectionData(String id, int frameIndex, int secondFrameIndex, String seq) { @@ -42,9 +43,10 @@ public class GLSelectionData extends DASelectionData { this.secondFrameIndex = secondFrameIndex; } - public GLSelectionData(String id, long start, long end, Object data, + public GLSelectionData(String id, String subid, long start, long end, Object data, Control control, int frameIndex, int secondIndex) { super(id, start, end, data, control); + this.subID = subid; this.frameIndex = frameIndex; this.secondFrameIndex = secondIndex; this.seq = null; @@ -61,4 +63,8 @@ public class GLSelectionData extends DASelectionData { public String getSeq() { return seq; } + + public String getSubID() { + return subID; + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java index baf6442..f7f8cad 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.ui.opengl.eventListner; -import java.util.ArrayList; import java.util.List; import org.eclipse.swt.SWT; @@ -35,11 +34,9 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; -import org.tizen.dynamicanalyzer.ui.opengl.ui.GLDetailsView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLChartView; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; +import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -82,8 +79,8 @@ public class GLFrameChartMouseEventListener extends return; } - if (eventFrameIndex * TimelineConstants.MEGA_DOUBLE <= ToolbarArea.getInstance() - .getTime()) { + if (eventFrameIndex * TimelineConstants.MEGA_DOUBLE <= ToolbarArea + .getInstance().getTime()) { startItem.setEnabled(true); endItem.setEnabled(true); analysisItem.setEnabled(rangeDataManager.isAnalyzable()); @@ -131,12 +128,8 @@ public class GLFrameChartMouseEventListener extends return; } - List viewNameList = new ArrayList(); - viewNameList.add(GLAPIListView.class.getName()); - viewNameList.add(GLDetailsView.class.getName()); - AnalyzerManager.getCurrentPage().updateSelectedViews( - new GLSelectionData(GLChartView.ID, index, -1, null), - viewNameList); + AnalyzerManager.getCurrentPage().updateView( + new GLSelectionData(GLPage.chartViewID, index, -1, null)); } @Override @@ -191,10 +184,9 @@ public class GLFrameChartMouseEventListener extends try { long time = GLDataMaker.getInstance().getFrameData(frame) .getGLApiDataList().get(0).getTime(); - AnalyzerManager.getCurrentPage() - .updatePage( - new DASelectionData(TimelineView.ID, time, time, - null, null)); + AnalyzerManager.getCurrentPage().updateView( + new DASelectionData(TimelinePage.timelineViewID, time, + time, null, null)); } catch (IndexOutOfBoundsException ie) { } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java index 63ad9cd..61c8a97 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.ui.opengl.eventListner; -import java.util.ArrayList; import java.util.List; import org.eclipse.swt.SWT; @@ -38,12 +37,10 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; import org.tizen.dynamicanalyzer.ui.opengl.data.model.FrameCountInfo; -import org.tizen.dynamicanalyzer.ui.opengl.ui.GLDetailsView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLChartView; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -58,7 +55,8 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class GLTimeChartMouseEventListener extends MouseAdapter implements MouseMoveListener { - protected RangeDataManager rangeDataManager = RangeDataManager.getInstance(); + protected RangeDataManager rangeDataManager = RangeDataManager + .getInstance(); protected DAPopupMenu menu; protected DATimeline timeline; protected double baseTime = TimelineConstants.NOT_INITED; @@ -96,8 +94,8 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements return; } - if (eventTime * TimelineConstants.MEGA_DOUBLE <= ToolbarArea.getInstance() - .getTime()) { + if (eventTime * TimelineConstants.MEGA_DOUBLE <= ToolbarArea + .getInstance().getTime()) { startItem.setEnabled(true); endItem.setEnabled(true); analysisItem.setEnabled(rangeDataManager.isAnalyzable()); @@ -146,19 +144,16 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements } // TODO - FrameCountInfo frameCountInfo = GLDataMaker.getInstance().getFrameCountInfo(index); + FrameCountInfo frameCountInfo = GLDataMaker.getInstance() + .getFrameCountInfo(index); System.out.println("start : " + frameCountInfo.getStartFrameIndex() + ", count : " + frameCountInfo.getFrameCount()); - List viewNameList = new ArrayList(); - viewNameList.add(GLAPIListView.class.getName()); - viewNameList.add(GLDetailsView.class.getName()); - AnalyzerManager.getCurrentPage().updateSelectedViews( - new GLSelectionData(GLChartView.ID, - frameCountInfo.getStartFrameIndex(), - frameCountInfo.getStartFrameIndex() - + frameCountInfo.getFrameCount(), null), - viewNameList); + AnalyzerManager.getCurrentPage().updateView( + new GLSelectionData(GLPage.chartViewID, frameCountInfo + .getStartFrameIndex(), frameCountInfo + .getStartFrameIndex() + frameCountInfo.getFrameCount(), + null)); } @Override @@ -266,9 +261,9 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements if (startTime < 0) { startTime = 0; } - AnalyzerManager.getCurrentPage().updatePage( - new DASelectionData(TimelineView.ID, startTime, endTime, null, - null)); + AnalyzerManager.getCurrentPage().updateView( + new DASelectionData(TimelinePage.timelineViewID, startTime, + endTime, null, null)); } private double getTooltipStartX(DAChartPlot plot, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java index f018293..7e8cc22 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java @@ -37,7 +37,6 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.GLPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; @@ -46,14 +45,11 @@ import org.tizen.dynamicanalyzer.ui.opengl.GLES20ErrorInformation; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLFrameData; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLChartView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class GLDetailsView extends DAView { - public static final String ID = GLDetailsView.class.getName(); +public class GLDetailsView extends DAViewComposite { public static final int LEFT_MARGIN = 10; public static final int HEIGHT_MARGIN = 20; @@ -80,17 +76,12 @@ public class GLDetailsView extends DAView { private GC m_gc; public GLDetailsView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(GLPageLabels.GL_DETAILS_VIEW_TITLE); + setTitle(GLPageLabels.GL_DETAILS_VIEW_TITLE); - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - setMaxWeight(innerMaxWeight, outerMaxWeight); - - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.setLayout(new FillLayout()); canvas = new Canvas(contents, SWT.TRANSPARENT); @@ -134,42 +125,54 @@ public class GLDetailsView extends DAView { } @Override - public void updateView(DASelectionData data) { - String id = data.getViewId(); - if (id.equals(GLChartView.ID) && data instanceof GLSelectionData) { - detail = DETAIL_FRAME; - - int frameIndex = ((GLSelectionData)data).getFrameIndex(); - GLFrameData glFrameData = GLDataMaker.getInstance().getFrameData( - frameIndex); - - frameNumber = "Frame# : " + String.valueOf(frameIndex + 1); - elapsedTime = "Elapsed time : " + glFrameData.getFrametime() + "(μs)"; - apiCount = glFrameData.getGLApiDataList().size() + " API(s)"; - errorCount = glFrameData.getErrorCount() + " error(s)"; - - } else if (id.equals(GLAPIListView.ID)) { - detail = DETAIL_API; - - GridItem[] gridItems = (GridItem[]) data.getData(); - DATableDataFormat tableDataFormat = (DATableDataFormat) gridItems[0] - .getData(); - GLES20LogData logData = (GLES20LogData)tableDataFormat.getLogData(); - - api = logData.getApiName(); - long error = logData.getErrno(); - if (error == 0) { - state = GLES20ErrorInformation.getErrorDescription(String.valueOf(error)); - } else { - state = getErrorDescription(api, - GLES20ErrorInformation.getError(error)); + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + + String id = data.getViewID(); + if (id.equals(GLPage.chartViewID) + && data instanceof GLSelectionData) { + detail = DETAIL_FRAME; + + int frameIndex = ((GLSelectionData) data).getFrameIndex(); + GLFrameData glFrameData = GLDataMaker.getInstance() + .getFrameData(frameIndex); + + frameNumber = "Frame# : " + String.valueOf(frameIndex + 1); + elapsedTime = "Elapsed time : " + glFrameData.getFrametime() + + "(μs)"; + apiCount = glFrameData.getGLApiDataList().size() + " API(s)"; + errorCount = glFrameData.getErrorCount() + " error(s)"; + + } else if (id.equals(GLPage.listViewID)) { + GLSelectionData gdata = (GLSelectionData) data; + if (!gdata.getSubID().equals(GLPage.listViewSubID)) { + detail = DETAIL_API; + + GridItem[] gridItems = (GridItem[]) data.getData(); + DATableDataFormat tableDataFormat = (DATableDataFormat) gridItems[0] + .getData(); + GLES20LogData logData = (GLES20LogData) tableDataFormat + .getLogData(); + + api = logData.getApiName(); + long error = logData.getErrno(); + if (error == 0) { + state = GLES20ErrorInformation + .getErrorDescription(String.valueOf(error)); + } else { + state = getErrorDescription(api, + GLES20ErrorInformation.getError(error)); + } + } + } else if (id.equals(GLPage.contextViewID)) { + if (data.getData() != null) + detail = DETAIL_CONTEXT; + // TODO } - } else if (id.equals(GLContextView.ID)) { - detail = DETAIL_CONTEXT; - // TODO - } - canvas.redraw(); + canvas.redraw(); + } } private String getErrorDescription(String apiName, String errorName) { @@ -200,7 +203,7 @@ public class GLDetailsView extends DAView { String errorDescription = GLES20ErrorInformation .getErrorDescription(apiName + errorName); - if(errorDescription == null) { + if (errorDescription == null) { return errorName; } else { return errorDescription; @@ -235,7 +238,7 @@ public class GLDetailsView extends DAView { if (m_start >= maxLength || next > maxLength) { return ""; } - + String s = m_txt.substring(m_start, next); m_start = next; if ((m_txt.length() - 1 > m_start) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java index af7fd77..d632b63 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java @@ -26,8 +26,6 @@ package org.tizen.dynamicanalyzer.ui.opengl.ui; -import java.util.List; - import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.layout.FillLayout; @@ -35,23 +33,23 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.logparser.Logs; -import org.tizen.dynamicanalyzer.swap.model.data.GLES20LogData; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; -import org.tizen.dynamicanalyzer.ui.opengl.data.inserter.GLContextDataInserter; import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLChartView; import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class GLPage extends DAPageComposite { - public static final String ID = GLPage.class.getName(); + public static final String pageID = GLPage.class.getName(); + public static final String chartViewID = GLChartView.class.getName(); + public static final String contextViewID = GLContextView.class.getName(); + public static final String listViewID = GLAPIListView.class.getName(); + public static final String listViewSubID = GLAPIListView.class.getName() + + ".sub"; + public static final String detailViewID = GLDetailsView.class.getName(); + private GLDataMaker glDataMaker; SashForm baseForm; @@ -68,7 +66,7 @@ public class GLPage extends DAPageComposite { glDataMaker = GLDataMaker.getInstance(); - name = AnalyzerLabels.COOLBAR_AREA_OPENGLES; + setTitle(AnalyzerLabels.COOLBAR_AREA_OPENGLES); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_GRAPHICS_TOOLTIP); this.setLayout(new FillLayout()); @@ -93,52 +91,41 @@ public class GLPage extends DAPageComposite { rightForm = new SashForm(baseForm, SWT.VERTICAL); - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, + SWT.NONE, GLPage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { GLPage.listViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { GLPage.listViewID }); addView(tabView); - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView.setObservingViews(new String[] { GLAPIListView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstackView = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstackView.setObservingViews(new String[] { GLAPIListView.ID }); - tabView.addView(callstackView, false); GLDetailsView detailsView = new GLDetailsView(rightForm, SWT.NONE); addView(detailsView); rightForm.setWeights(new int[] { 50, 50 }); baseForm.setWeights(new int[] { 75, 25 }); - + baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); - } - @Override - protected void setFormWeights() { - baseForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); + DataManagerRegistry.registerPageDataManager(glDataMaker); } @Override - public void updateLog(LogPackage logPack) { - Logs glesLogs = logPack.getLogs(DataChannelConstants.MSG_PROBE_GLES20); - if (glesLogs == null || glesLogs.getRawLogs().size() == 0) { - return; - } - - List logDataList = glesLogs.getRawLogs(); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; - for (LogData logData : logDataList) { - glDataMaker.addGLAPIData((GLES20LogData) logData); + if ((wrate > (100 - 37)) || hrate > 100) { + return; } - GLContextDataInserter.getContextDataQueue().push( - glDataMaker.getContextValueDAInputListAndClear()); - GLContextDataInserter.startinserterThread(); + baseForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java index 898c7a0..274110f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java @@ -55,16 +55,18 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLAPIData; import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLFrameData; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; 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.widgets.da.view.DAViewComposite; public class GLAPIListTable extends DAApiListTableComposite { - public static final String ID = GLAPIListTable.class.getName(); private static final String EMPTY = ""; - private String[] columnNames = { GLPageLabels.GL_API_LIST_VIEW_SEQ, EMPTY, + private String[] columnNames = { + GLPageLabels.GL_API_LIST_VIEW_SEQ, + EMPTY, GLPageLabels.GL_API_LIST_VIEW_TIME, GLPageLabels.GL_API_LIST_VIEW_NAME, GLPageLabels.GL_API_LIST_VIEW_PARAMETER, @@ -75,14 +77,15 @@ public class GLAPIListTable extends DAApiListTableComposite { private int[] columnSizes = { 40, 0, 70, 120, 250, 105, 95, 60, 60 }; private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, - SWT.LEFT, SWT.RIGHT, SWT.LEFT,SWT.RIGHT, SWT.RIGHT }; + SWT.LEFT, SWT.RIGHT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT }; private int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,}; + AnalyzerConstants.SORT_TYPE_NUM, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, }; private int startFrameIndex = 0; private int endFrameIndex = -1; @@ -111,11 +114,10 @@ public class GLAPIListTable extends DAApiListTableComposite { .getData(); long time = dataFormat.getLogData().getTime(); - GLSelectionData selData = new GLSelectionData(GLAPIListView.ID, - time, time, items, table, startFrameIndex, -1); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - GLAPIListView.ID); + GLSelectionData selData = new GLSelectionData( + GLPage.listViewID, GLPage.listViewID, time, time, + items, table, startFrameIndex, -1); + AnalyzerManager.getCurrentPage().updateView(selData); for (GridItem gridItem : secondSelectedItemsList) { gridItem.setBackground(ColorResources.TABLE_CONTENTS_NORMAL); @@ -146,10 +148,10 @@ public class GLAPIListTable extends DAApiListTableComposite { DATableDataFormat dataFormat = (DATableDataFormat) items[0].getData(); long time = dataFormat.getLogData().getTime(); - GLSelectionData selData = new GLSelectionData(GLAPIListTable.ID, time, - time, items, table, startFrameIndex, -1); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(GLAPIListView.ID); + GLSelectionData selData = new GLSelectionData(GLPage.listViewID, + GLPage.listViewSubID, time, time, items, table, + startFrameIndex, -1); + AnalyzerManager.getCurrentPage().updateView(selData); } public void updateTableFromTimeMode(int startFrameIndex, int endFrameIndex) { @@ -163,28 +165,28 @@ public class GLAPIListTable extends DAApiListTableComposite { table.setSelection(0); GridItem[] items = table.getSelection(); - if (items == null || items.length == 0 ) { + if (items == null || items.length == 0) { return; } DATableDataFormat dataFormat = (DATableDataFormat) items[0].getData(); long time = dataFormat.getLogData().getTime(); - GLSelectionData selData = new GLSelectionData(GLAPIListTable.ID, time, - time, items, table, startFrameIndex, -1); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(GLAPIListView.ID); + GLSelectionData selData = new GLSelectionData(GLPage.listViewID, + GLPage.listViewSubID, time, time, items, table, + startFrameIndex, -1); + AnalyzerManager.getCurrentPage().updateView(selData); } public void updateTableFromNavi(int frameIndex, String seq, - ViewContainer viewContainer) { + DAViewComposite view) { if (endFrameIndex == -1 || (frameIndex < startFrameIndex || frameIndex > endFrameIndex)) { startFrameIndex = frameIndex; endFrameIndex = -1; - viewContainer.setTitleText(GLPageLabels.GL_API_LIST_VIEW_TITLE - + "(" + frameIndex + "frame)"); + view.setTitle(GLPageLabels.GL_API_LIST_VIEW_TITLE + "(" + + frameIndex + "frame)"); } selectedTreeInvolvedOrdinalList = null; @@ -199,12 +201,10 @@ public class GLAPIListTable extends DAApiListTableComposite { .getData(); long time = dataFormat.getLogData().getTime(); - GLSelectionData selData = new GLSelectionData(GLAPIListView.ID, - time, time, new GridItem[] { gridItem }, table, - frameIndex, -1); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - GLAPIListView.ID); + GLSelectionData selData = new GLSelectionData( + GLPage.listViewID, GLPage.listViewID, time, time, + new GridItem[] { gridItem }, table, frameIndex, -1); + AnalyzerManager.getCurrentPage().updateView(selData); table.getVerticalBar().setSelection(i); selectedItemIndex = i; @@ -290,10 +290,10 @@ public class GLAPIListTable extends DAApiListTableComposite { for (int i = 0; i < glAPIDataList.size(); i++) { GLAPIData glAPIData = glAPIDataList.get(i); int selectedPid = ToolbarArea.getInstance().getSelectedPid(); - if(selectedPid != 0 && selectedPid != glAPIData.getPID()) { + if (selectedPid != 0 && selectedPid != glAPIData.getPID()) { continue; } - + List texts = new ArrayList(); DATableDataFormat tableData = new DATableDataFormat( glAPIData.getTime()); @@ -310,16 +310,16 @@ public class GLAPIListTable extends DAApiListTableComposite { texts.add(String.valueOf(glAPIData.getPID())); texts.add(String.valueOf(glAPIData.getTID())); texts.add(glAPIData.getParameter()); - + tableData.getData().addAll(texts); TableInput tableInput = new TableInput(); tableInput.setText(texts); tableInput.setData(tableData); - if(glAPIData.getErrorNo() != 0) { + if (glAPIData.getErrorNo() != 0) { tableInput.setFailed(true); } - + inputList.add(tableInput); if (involvedMap != null) { @@ -442,10 +442,9 @@ public class GLAPIListTable extends DAApiListTableComposite { if (input.get(i).isFailed()) { gridItem.setBackground(ColorResources.TABLE_CONTENTS_FAILED_BACGOUND_COLOR); gridItem.setForeground(ColorResources.TABLE_CONTENTS_FAILED_FONT_COLOR); - gridItem.setImage(0, - ImageResources.FAILED_API_ICON_TABLE); + gridItem.setImage(0, ImageResources.FAILED_API_ICON_TABLE); } - + if (gridData != null) { long seqNum = gridData.getSelectionKey(); for (int ii = 0; ii < selSeqs.size(); ii++) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java index 0316b27..46ac143 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java @@ -28,42 +28,29 @@ package org.tizen.dynamicanalyzer.ui.opengl.ui.apiList; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.GLPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.opengl.data.GLContextTreeNodeData; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; -import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLChartView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextTreeTable; -import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class GLAPIListView extends DAView { - public static final String ID = GLAPIListView.class.getName(); - - private ViewContainer viewContainer; +public class GLAPIListView extends DAViewComposite { private boolean updateTable = true; - private int[] innerMaxWeight = { 0, 100 }; - private int[] outerMaxWeight = { 100, 0 }; - private int[] bottomMaxWeight = { 100, 0 }; - - private int[] oldBottomLayout = null; - GLAPIListTable glAPIListTable; public GLAPIListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(GLPageLabels.GL_API_LIST_VIEW_TITLE); + setTitle(GLPageLabels.GL_API_LIST_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); @@ -73,103 +60,64 @@ public class GLAPIListView extends DAView { @Override public void updateView() { - if(updateTable) { + if (updateTable) { glAPIListTable.updateTable(); - + updateTable = false; } } @Override - public void updateView(DASelectionData data) { - String id = data.getViewId(); - if (id.equals(GLChartView.ID) && data instanceof GLSelectionData) { - int endFrameIndex = ((GLSelectionData) data) - .getSecondFrameIndex(); - int frameIndex = ((GLSelectionData) data).getFrameIndex(); - if (endFrameIndex == -1) { // frame mode - String title = GLPageLabels.GL_API_LIST_VIEW_TITLE + "(" - + frameIndex + "frame)"; - viewContainer.setTitleText(title); - glAPIListTable.updateTableFromFrameMode(frameIndex); - } else { // time mode - String title = GLPageLabels.GL_API_LIST_VIEW_TITLE + "(" - + frameIndex + "-" + (endFrameIndex - 1) + "frame)"; - viewContainer.setTitleText(title); - glAPIListTable.updateTableFromTimeMode(frameIndex, endFrameIndex); + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + + String id = data.getViewID(); + if (id.equals(GLPage.chartViewID)) { + if (data instanceof GLSelectionData) { + int endFrameIndex = ((GLSelectionData) data) + .getSecondFrameIndex(); + int frameIndex = ((GLSelectionData) data).getFrameIndex(); + if (endFrameIndex == -1) { // frame mode + String title = GLPageLabels.GL_API_LIST_VIEW_TITLE + + "(" + frameIndex + "frame)"; + setTitle(title); + glAPIListTable.updateTableFromFrameMode(frameIndex); + } else { // time mode + String title = GLPageLabels.GL_API_LIST_VIEW_TITLE + + "(" + frameIndex + "-" + (endFrameIndex - 1) + + "frame)"; + setTitle(title); + glAPIListTable.updateTableFromTimeMode(frameIndex, + endFrameIndex); + } + } + } else if (id.equals(GLPage.contextViewID)) { + Object odata = data.getData(); + if (odata == null) { + int frameIndex = ((GLSelectionData) data).getFrameIndex(); + String seq = ((GLSelectionData) data).getSeq(); + + glAPIListTable.updateTableFromNavi(frameIndex, seq, this); + } else { + GridItem gridItem = (GridItem) odata; + GLContextTreeNodeData nodeData = (GLContextTreeNodeData) gridItem + .getData(); + glAPIListTable.updateTableFromContextView( + nodeData.getInvolvedDBColumnIndexList(), + nodeData.getInsideColumnIndex1()); + } } - } else if (id.equals(GLContextView.ID)) { - GridItem gridItem = (GridItem) data.getData(); - GLContextTreeNodeData nodeData = (GLContextTreeNodeData) gridItem - .getData(); - glAPIListTable.updateTableFromContextView(nodeData.getInvolvedDBColumnIndexList(), - nodeData.getInsideColumnIndex1()); - } else if (id.equals(GLContextTreeTable.ID)) { - int frameIndex = ((GLSelectionData) data).getFrameIndex(); - String seq = ((GLSelectionData) data).getSeq(); - - glAPIListTable.updateTableFromNavi(frameIndex, seq, viewContainer); } - } - - @Override - public void otherViewSelectionOccured() { + + // other view selection occurred glAPIListTable.deselectAll(); } @Override public void clear() { - viewContainer.setTitleText(GLPageLabels.GL_API_LIST_VIEW_TITLE); + setTitle(GLPageLabels.GL_API_LIST_VIEW_TITLE); glAPIListTable.clear(); updateTable = true; } - - @Override - public void setMaxSize(boolean maximized) { - - if (null == innerMaxWeight || null == outerMaxWeight) { - return; - } - - Composite bParent = getParent(); - if (!(bParent instanceof SashForm)) { - bParent = bParent.getParent(); - if (!(bParent instanceof SashForm)) { - bParent = bParent.getParent(); - if (!(bParent instanceof SashForm)) { - return; - } - } - } - - Composite parent = bParent.getParent(); - if (!(parent instanceof SashForm)) { - parent = parent.getParent(); - if (!(parent instanceof SashForm)) { - return; - } - } - - Composite pParent = parent.getParent(); - if (!(pParent instanceof SashForm)) { - return; - } - - SashForm bottomForm = (SashForm) bParent; - SashForm innerForm = (SashForm) parent; - SashForm outerForm = (SashForm) pParent; - - if (maximized) { - oldInnerLayout = innerForm.getWeights(); - oldOuterLayout = outerForm.getWeights(); - oldBottomLayout = bottomForm.getWeights(); - outerForm.setWeights(outerMaxWeight); - innerForm.setWeights(innerMaxWeight); - bottomForm.setWeights(bottomMaxWeight); - } else { - innerForm.setWeights(oldInnerLayout); - outerForm.setWeights(oldOuterLayout); - bottomForm.setWeights(oldBottomLayout); - } - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java index f2851b8..391b3a0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java @@ -31,7 +31,6 @@ import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.GLPageLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -45,13 +44,12 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; import org.tizen.dynamicanalyzer.ui.opengl.eventListner.BoundLineEventListener; import org.tizen.dynamicanalyzer.ui.opengl.eventListner.GLFrameChartMouseEventListener; import org.tizen.dynamicanalyzer.ui.opengl.eventListner.GLTimeChartMouseEventListener; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -60,10 +58,11 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboSelectionListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class GLChartView extends DAView { - public static final String ID = GLChartView.class.getName(); +public class GLChartView extends DAViewComposite { private static final int COMBO_HEIGHT = 24; private final RangeDataManager rangeDataManager = RangeDataManager @@ -77,24 +76,25 @@ public class GLChartView extends DAView { private GLDataMaker glDataMaker = GLDataMaker.getInstance(); public GLChartView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(ThreadPageLabels.THREAD_CHART_TITLE); + setTitle(ThreadPageLabels.THREAD_CHART_TITLE); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); contents.setLayout(stackLayout); frameChartBoard = new DAChartBoard(contents, - GLPageLabels.GL_CHART_TITLE_FRAME_TIME, DAChartBoard.BOARD_STYLE_FRAME); + GLPageLabels.GL_CHART_TITLE_FRAME_TIME, + DAChartBoard.BOARD_STYLE_FRAME); frameChartBoard.setNameFont(FontResources.CHART_NAME_FONT); timeChartBoard = new DAChartBoard(contents, - GLPageLabels.GL_CHART_TITLE_FRAME_RATE, DAChartBoard.BOARD_STYLE_TIME); + GLPageLabels.GL_CHART_TITLE_FRAME_RATE, + DAChartBoard.BOARD_STYLE_TIME); timeChartBoard.setNameFont(FontResources.CHART_NAME_FONT); stackLayout.topControl = frameChartBoard; @@ -131,8 +131,7 @@ public class GLChartView extends DAView { if (null == selected || selected.isEmpty()) { return; } - if (selected - .equals(GLPageLabels.GL_CHART_TITLE_FRAME_RATE)) { + if (selected.equals(GLPageLabels.GL_CHART_TITLE_FRAME_RATE)) { changeComboFrameToTime(); } else { return; @@ -173,8 +172,7 @@ public class GLChartView extends DAView { if (null == selected || selected.isEmpty()) { return; } - if (selected - .equals(GLPageLabels.GL_CHART_TITLE_FRAME_TIME)) { + if (selected.equals(GLPageLabels.GL_CHART_TITLE_FRAME_TIME)) { changeComboTimeToFrame(); } else { return; @@ -184,7 +182,7 @@ public class GLChartView extends DAView { frameChartBoard.setSelectable(false); timeChartBoard.setSelectable(false); - + initializeCharts(); DATimeline frameTimeline = frameChartBoard.getTimeline(); @@ -264,34 +262,45 @@ public class GLChartView extends DAView { ((DAChartPlotIntervalMarker) frameChartBoard.getMarkers().get( UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - rangeDataManager.getMarkerStartTime() / TimelineConstants.MEGA_DOUBLE, - rangeDataManager.getMarkerEndTime() / TimelineConstants.MEGA_DOUBLE); + rangeDataManager.getMarkerStartTime() + / TimelineConstants.MEGA_DOUBLE, + rangeDataManager.getMarkerEndTime() + / TimelineConstants.MEGA_DOUBLE); } @Override - public void updateView(DASelectionData data) { - String id = data.getViewId(); - if (id.equals(GLAPIListView.ID)) { - int frameIndex = ((GLSelectionData) data).getFrameIndex(); - - frameChartBoard.setVisibleMiddleTime(frameIndex); - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) frameChartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(frameIndex, frameIndex); - - long start = data.getStartTime(); - long end = data.getEndTime(); - Double startTime = start / TimelineConstants.MEGA_DOUBLE; - Double endTime = end / TimelineConstants.MEGA_DOUBLE; - double middleTime = (startTime + endTime) / 2.0; - if (startTime.equals(endTime)) { - middleTime = startTime; + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + + String id = data.getViewID(); + if (id.equals(GLPage.listViewID)) { + String subID = ((GLSelectionData) data).getSubID(); + if (!subID.equals(GLPage.listViewSubID)) { + int frameIndex = ((GLSelectionData) data).getFrameIndex(); + + frameChartBoard.setVisibleMiddleTime(frameIndex); + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) frameChartBoard + .getMarkers().get( + UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(frameIndex, frameIndex); + + long start = data.getStartTime(); + long end = data.getEndTime(); + Double startTime = start / TimelineConstants.MEGA_DOUBLE; + Double endTime = end / TimelineConstants.MEGA_DOUBLE; + double middleTime = (startTime + endTime) / 2.0; + if (startTime.equals(endTime)) { + middleTime = startTime; + } + + timeChartBoard.setVisibleMiddleTime(middleTime); + intervalMarker = (DAChartPlotIntervalMarker) timeChartBoard + .getMarkers().get( + UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } } - - timeChartBoard.setVisibleMiddleTime(middleTime); - intervalMarker = (DAChartPlotIntervalMarker) timeChartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); } } @@ -306,39 +315,46 @@ public class GLChartView extends DAView { private void initializeCharts() { initIntervalMarkers(frameChartBoard); - + GLFrameTimeChart frameTimeChart = GLFrameTimeChart.getInstance(); - DAChartBoardItem frameTimeChartItem = frameTimeChart.createBoardItem(frameChartBoard); + DAChartBoardItem frameTimeChartItem = frameTimeChart + .createBoardItem(frameChartBoard); DAChart frameTimeChartWidget = frameTimeChartItem.getChart(); - + GLFrameChartMouseEventListener glFrameChartMouseEventListener = new GLFrameChartMouseEventListener( frameTimeChart.getPopupMenu(), frameChartBoard.getTimeline()); - + frameTimeChartWidget.getPlot().setMarkers(frameChartBoard.getMarkers()); frameTimeChartWidget.addMouseListener(glFrameChartMouseEventListener); - frameTimeChartWidget.addMouseMoveListener(glFrameChartMouseEventListener); - frameTimeChartWidget.addMouseTrackListener(new TimelineChartMouseTrackAdapter( - frameChartBoard.getTimeline())); - - BoundLineEventListener upperBoundLineEventListener = new BoundLineEventListener(frameTimeChartWidget, DAChartPlot.BoundType.UPPER); + frameTimeChartWidget + .addMouseMoveListener(glFrameChartMouseEventListener); + frameTimeChartWidget + .addMouseTrackListener(new TimelineChartMouseTrackAdapter( + frameChartBoard.getTimeline())); + + BoundLineEventListener upperBoundLineEventListener = new BoundLineEventListener( + frameTimeChartWidget, DAChartPlot.BoundType.UPPER); frameTimeChartWidget.addMouseListener(upperBoundLineEventListener); frameTimeChartWidget.addMouseMoveListener(upperBoundLineEventListener); frameTimeChartWidget.addMouseTrackListener(upperBoundLineEventListener); - + initIntervalMarkers(timeChartBoard); GLFrameRateChart frameRateChart = GLFrameRateChart.getInstance(); - DAChartBoardItem frameRateChartItem = frameRateChart.createBoardItem(timeChartBoard); + DAChartBoardItem frameRateChartItem = frameRateChart + .createBoardItem(timeChartBoard); DAChart frameRateChartWidget = frameRateChartItem.getChart(); GLTimeChartMouseEventListener glTimeChartMouseEventListener = new GLTimeChartMouseEventListener( frameRateChart.getPopupMenu(), timeChartBoard.getTimeline()); - + frameRateChartWidget.getPlot().setMarkers(timeChartBoard.getMarkers()); frameRateChartWidget.addMouseListener(glTimeChartMouseEventListener); - frameRateChartWidget.addMouseMoveListener(glTimeChartMouseEventListener); - frameRateChartWidget.addMouseTrackListener(new TimelineChartMouseTrackAdapter( - timeChartBoard.getTimeline())); + frameRateChartWidget + .addMouseMoveListener(glTimeChartMouseEventListener); + frameRateChartWidget + .addMouseTrackListener(new TimelineChartMouseTrackAdapter( + timeChartBoard.getTimeline())); } private void initIntervalMarkers(DAChartBoard board) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextTreeTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextTreeTable.java index 7dac523..353e565 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextTreeTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextTreeTable.java @@ -64,14 +64,11 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.GLContextDBEnum; import org.tizen.dynamicanalyzer.ui.opengl.data.GLContextTreeNodeData; import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataMaker; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; -import org.tizen.dynamicanalyzer.ui.opengl.ui.GLDetailsView; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; public class GLContextTreeTable extends DATreeComposite { - public static final String ID = GLContextTreeTable.class.getName(); - private enum ButtonType { LEFTLEFT, LEFT, RIGHT, RIGHTRIGHT } @@ -163,11 +160,9 @@ public class GLContextTreeTable extends DATreeComposite { if (items == null || items.length <= 0) { return; } - DASelectionData selData = new DASelectionData(GLContextView.ID, + DASelectionData selData = new DASelectionData(GLPage.contextViewID, 0, 0, items[0], table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - GLContextView.ID); + AnalyzerManager.getCurrentPage().updateView(selData); for (TreeInput treeInput : contextTree) { clearSecondSelection(treeInput); @@ -1451,13 +1446,10 @@ public class GLContextTreeTable extends DATreeComposite { String[] prevChangeInfo = list.get(bSearchedIndex).split( GLDataMaker.DELIMITER); - List viewNameList = new ArrayList(); - viewNameList.add(GLAPIListView.class.getName()); - viewNameList.add(GLDetailsView.class.getName()); - AnalyzerManager.getCurrentPage().updateSelectedViews( - new GLSelectionData(GLContextTreeTable.ID, + AnalyzerManager.getCurrentPage().updateView( + new GLSelectionData(GLPage.contextViewID, Integer.parseInt(prevChangeInfo[0]), -1, - prevChangeInfo[1]), viewNameList); + prevChangeInfo[1])); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java index 5217ab7..df84970 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java @@ -28,40 +28,28 @@ package org.tizen.dynamicanalyzer.ui.opengl.ui.context; import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.GLPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.opengl.data.GLSelectionData; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListTable; -import org.tizen.dynamicanalyzer.ui.opengl.ui.apiList.GLAPIListView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class GLContextView extends DAView { - public static final String ID = GLContextView.class.getName(); - - private ViewContainer viewContainer; +public class GLContextView extends DAViewComposite { private GLContextTreeTable glContextTreeTable; - private int[] innerMaxWeight = { 0, 100 }; - private int[] outerMaxWeight = { 100, 0 }; - private int[] bottomMaxWeight = { 0, 100 }; - - private int[] oldBottomLayout = null; - public GLContextView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(GLPageLabels.GL_CONTEXT_VIEW_TITLE); + setTitle(GLPageLabels.GL_CONTEXT_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.setLayout(new FillLayout()); glContextTreeTable = GLContextTreeTable.getInstance(contents, SWT.NONE, @@ -74,81 +62,33 @@ public class GLContextView extends DAView { } @Override - public void updateView(DASelectionData data) { - String id = data.getViewId(); - if ((id.equals(GLAPIListView.ID) && data instanceof GLSelectionData) - || id.equals(GLAPIListTable.ID)) { - GridItem[] gridItems = (GridItem[]) data.getData(); - DATableDataFormat tableDataFormat = (DATableDataFormat) gridItems[0] - .getData(); - LogData logData = tableDataFormat.getLogData(); - - int frameIndex = ((GLSelectionData) data).getFrameIndex(); - String seq = Integer.toString(logData.getSeq()); - glContextTreeTable.updateTree(seq); - - viewContainer.setTitleText(GLPageLabels.GL_CONTEXT_VIEW_TITLE + "(" - + frameIndex + "frame #" + seq + ")"); + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + + String id = data.getViewID(); + if ((id.equals(GLPage.listViewID) && data instanceof GLSelectionData)) { + GridItem[] gridItems = (GridItem[]) data.getData(); + DATableDataFormat tableDataFormat = (DATableDataFormat) gridItems[0] + .getData(); + LogData logData = tableDataFormat.getLogData(); + + int frameIndex = ((GLSelectionData) data).getFrameIndex(); + String seq = Integer.toString(logData.getSeq()); + glContextTreeTable.updateTree(seq); + + setTitle(GLPageLabels.GL_CONTEXT_VIEW_TITLE + "(" + + frameIndex + "frame #" + seq + ")"); + } } + + // other view selection occurred + glContextTreeTable.deselectAll(); } @Override public void clear() { glContextTreeTable.clear(); - viewContainer.setTitleText(GLPageLabels.GL_CONTEXT_VIEW_TITLE); - } - - @Override - public void otherViewSelectionOccured() { - glContextTreeTable.deselectAll(); - } - - @Override - public void setMaxSize(boolean maximized) { - - if (null == innerMaxWeight || null == outerMaxWeight) { - return; - } - - Composite bParent = getParent(); - if (!(bParent instanceof SashForm)) { - bParent = bParent.getParent(); - if (!(bParent instanceof SashForm)) { - bParent = bParent.getParent(); - if (!(bParent instanceof SashForm)) { - return; - } - } - } - - Composite parent = bParent.getParent(); - if (!(parent instanceof SashForm)) { - parent = parent.getParent(); - if (!(parent instanceof SashForm)) { - return; - } - } - - Composite pParent = parent.getParent(); - if (!(pParent instanceof SashForm)) { - return; - } - - SashForm bottomForm = (SashForm) bParent; - SashForm innerForm = (SashForm) parent; - SashForm outerForm = (SashForm) pParent; - - if (maximized) { - oldInnerLayout = innerForm.getWeights(); - oldOuterLayout = outerForm.getWeights(); - oldBottomLayout = bottomForm.getWeights(); - outerForm.setWeights(outerMaxWeight); - innerForm.setWeights(innerMaxWeight); - bottomForm.setWeights(bottomMaxWeight); - } else { - innerForm.setWeights(oldInnerLayout); - outerForm.setWeights(oldOuterLayout); - bottomForm.setWeights(oldBottomLayout); - } + setTitle(GLPageLabels.GL_CONTEXT_VIEW_TITLE); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java index 1e7c829..f579644 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java @@ -26,13 +26,10 @@ package org.tizen.dynamicanalyzer.ui.page; -import java.util.HashMap; - import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.part.ViewPart; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.ui.file.FilePage; import org.tizen.dynamicanalyzer.ui.kernel.KernelPage; import org.tizen.dynamicanalyzer.ui.network.NetworkPage; @@ -42,7 +39,9 @@ import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; import org.tizen.dynamicanalyzer.workbench.LayoutManager; public class BaseView extends ViewPart { @@ -51,8 +50,6 @@ public class BaseView extends ViewPart { DAPageComposite topComposite = null; DATabComposite tabView = null; - private HashMap views = null; - @Override public void createPartControl(Composite parent) { // create toolbar @@ -63,35 +60,35 @@ public class BaseView extends ViewPart { tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED); tabView.setTabWidth(110); { - Composite timelinePage = new TimelinePage( + DABaseComposite timelinePage = new TimelinePage( tabView.getContentComposite(), SWT.NONE); tabView.addView(timelinePage, false); - Composite threadPage = new ThreadPage( + DABaseComposite threadPage = new ThreadPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(threadPage, false); - Composite networkPage = new NetworkPage( + DABaseComposite networkPage = new NetworkPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(networkPage, false); - Composite filePage = new FilePage(tabView.getContentComposite(), + DABaseComposite filePage = new FilePage(tabView.getContentComposite(), SWT.NONE); tabView.addView(filePage, false); - Composite graphicsPage = new GLPage(tabView.getContentComposite(), + DABaseComposite graphicsPage = new GLPage(tabView.getContentComposite(), SWT.NONE); tabView.addView(graphicsPage, false); - Composite uiPage = new UIPage(tabView.getContentComposite(), + DABaseComposite uiPage = new UIPage(tabView.getContentComposite(), SWT.NONE); tabView.addView(uiPage, false); - Composite kernelPage = new KernelPage( + DABaseComposite kernelPage = new KernelPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(kernelPage, false); - Composite summaryPage = new SummaryPage( + DABaseComposite summaryPage = new SummaryPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(summaryPage, false); } @@ -120,7 +117,4 @@ public class BaseView extends ViewPart { tabView.clear(); } - public HashMap getAllViewHash() { - return views; - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/DAPageComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/DAPageComposite.java deleted file mode 100644 index 3fe74bc..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/DAPageComposite.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.ui.page; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.eclipse.swt.events.ControlEvent; -import org.eclipse.swt.events.ControlListener; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.tizen.dynamicanalyzer.appearance.DesignConstants; -import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; - -public class DAPageComposite extends Composite implements ViewAction { - - public static final String KEY_TOOLTIP = "tooltip"; - private HashMap viewMap = null; - private List views = null; - protected String name = null; - - private static final double DEFAULT_WIDTH = DesignConstants.SNAPSHOT_VIEW_WIDTH + 10; - private static final double DEFAULT_HEIGHT = DesignConstants.SNAPSHOT_VIEW_HEIGHT - + 10 + DesignConstants.VIEW_TITLEBAR_HEIGHT; - - protected int wRate = 0; - protected int hRate = 0; - - public DAPageComposite(Composite parent, int style) { - super(parent, style); - viewMap = new HashMap(); - views = new ArrayList(); - this.addControlListener(new ControlListener() { - - @Override - public void controlResized(ControlEvent e) { - Composite composite = (Composite) e.widget; - Rectangle rect = composite.getBounds(); - int pageWidth = rect.width; - int pageHeight = rect.height; - - wRate = (int) (DEFAULT_WIDTH * 100 / pageWidth); - hRate = (int) (DEFAULT_HEIGHT * 100 / pageHeight); - wRate = (wRate >= 100) ? 100 : wRate; - hRate = (hRate >= 100) ? 100 : hRate; - - if ((wRate >= (100 - 37)) || hRate >= 100) { - return; - } - - setFormWeights(); - } - - @Override - public void controlMoved(ControlEvent e) { - } - }); - } - - public List getViews() { - return views; - } - - public HashMap getViewMap() { - return viewMap; - } - - public void updatePage() { - int size = views.size(); - for (int i = 0; i < size; i++) { - if (null != views.get(i)) { - views.get(i).updateView(); - } - } - } - - public void updateLog(LogPackage logPack) { - int size = views.size(); - for (int i = 0; i < size; i++) { - if (null != views.get(i)) { - views.get(i).updateLog(logPack); - } - } - } - - public void clear() { - int size = views.size(); - for (int i = 0; i < size; i++) { - if (null != views.get(i)) { - views.get(i).clear(); - } - } - } - - public void updatePage(final DASelectionData data) { - String viewId = data.getViewId(); - int size = views.size(); - for (int i = 0; i < size; i++) { - String key = views.get(i).getClass().getName(); - if (key != null && !key.equals(viewId)) { - final ViewAction view = viewMap.get(key); - if (null != view) { - view.updateView(data); - } - } - } - } - - public void updateSelectedViews(DASelectionData data, List viewNames) { - int size = viewNames.size(); - for (int i = 0; i < size; i++) { - viewMap.get(viewNames.get(i)).updateView(data); - } - } - - public boolean addView(String viewId, ViewAction view) { - if (null == viewId || viewId.isEmpty()) { - viewId = view.getClass().getName(); - } - - if (null != viewMap.get(viewId)) { - return false; - } - viewMap.put(viewId, view); - views.add(view); - return true; - } - - public boolean addView(ViewAction view) { - return addView(null, view); - } - - public void controlSelection(String viewId) { - int size = views.size(); - for (int i = 0; i < size; i++) { - String key = views.get(i).getClass().getName(); - if (key != null && !key.equals(viewId)) { - ViewAction view = viewMap.get(key); - if (null != view) { - view.otherViewSelectionOccured(); - } - } - } - } - - public ViewAction getView(String viewId) { - return viewMap.get(viewId); - } - - @Override - public void updateView() { - updatePage(); - } - - @Override - public Control getControl() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void updateView(DASelectionData data) { - updatePage(data); - } - - @Override - public void otherViewSelectionOccured() { - // TODO Auto-generated method stub - - } - - @Override - public String getViewName() { - return name; - } - - @Override - public void setSelection(LogData data) { - int size = views.size(); - for (int i = 0; i < size; i++) { - if (null != views.get(i)) { - views.get(i).setSelection(data); - } - } - } - - protected void setFormWeights() { - - } -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java new file mode 100644 index 0000000..4e3e415 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ScreenshotTabComposite.java @@ -0,0 +1,49 @@ +package org.tizen.dynamicanalyzer.ui.page; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.tizen.dynamicanalyzer.appearance.DesignConstants; +import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ImageViewer; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView; +import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; + +public class ScreenshotTabComposite extends DATabComposite { + public static final String tabID = ScreenshotTabComposite.class.getName(); + public static final String screenshotViewID = ScreenshotView.class.getName(); + public static final String callstackViewID = CallstackView.class.getName(); + public static final String imageViewerID = ImageViewer.class.getName(); + + public static final double DEFAULT_WIDTH = DesignConstants.SCREENSHOT_VIEW_WIDTH + 10; + public static final double DEFAULT_HEIGHT = DesignConstants.SCREENSHOT_VIEW_HEIGHT + + 10 + DesignConstants.VIEW_TITLEBAR_HEIGHT; + + { + ID = tabID; + } + + public ScreenshotTabComposite(Composite parent, int style, String pageID) { + super(parent, style, false); + + ScreenshotView screenshotView = new ScreenshotView(getContentComposite(), + SWT.NONE, false, pageID); + addView(screenshotView, false); + + CallstackView callstack = new CallstackView(getContentComposite(), + SWT.NONE); + addView(callstack, false); + } + + public void setObservingViews(String viewid, String[] observingIDs) { + DABaseComposite view = getView(viewid); + if (view instanceof ScreenshotView) { + ((ScreenshotView) view).setObservingViews(observingIDs); + } else if (view instanceof CallstackView) { + ((CallstackView) view).setObservingViews(observingIDs); + } else { + // do nothing + } + } + +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ViewAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ViewAction.java deleted file mode 100644 index 0891af9..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/ViewAction.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Dynamic Analyzer - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: - * Jooyoul Lee - * Juyoung Kim - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Contributors: - * - S-Core Co., Ltd - * - */ - -package org.tizen.dynamicanalyzer.ui.page; - -import org.eclipse.swt.widgets.Control; -import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; - - -public interface ViewAction { - - public void updateView(); - - public void updateLog(LogPackage logPack); - - public void clear(); - - public Control getControl(); - - public void updateView(DASelectionData data); - - public void otherViewSelectionOccured(); - - public String getViewName(); - - public void setSelection(LogData data); -} 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 ce9b2b4..f4208da 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 @@ -31,7 +31,6 @@ import java.util.HashMap; import java.util.List; import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; @@ -48,7 +47,6 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackManager; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedChecker; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedData; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDetector; @@ -56,11 +54,13 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.widgets.DATabButton; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; +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; public class RangeDataManager implements Runnable { private static RangeDataManager instance = null; @@ -114,15 +114,15 @@ public class RangeDataManager implements Runnable { isBeingAnalyzed = false; DAPageComposite page = AnalyzerManager.getCurrentPage(); if (page instanceof RangePage) { - AnalyzerUtil.changePage(TimelinePage.ID); + AnalyzerUtil.changePage(TimelinePage.pageID); } else { - page.updatePage(); + page.updateView(); } DATabComposite mainTab = AnalyzerUtil.getMainTab(); - if (null != mainTab.getTab(RangePage.ID)) { -// mainTab.removeView(page.getViewName(), true); - mainTab.removeView(RangePage.ID, true); + if (null != mainTab.getView(RangePage.pageID)) { + // mainTab.removeView(page.getViewName(), true); + mainTab.removeView(RangePage.pageID, true); } } }); @@ -144,8 +144,8 @@ public class RangeDataManager implements Runnable { public void startRangeAnalysis() { if (!isBeingAnalyzed) { DATabComposite mainTab = AnalyzerUtil.getMainTab(); - Composite rangePage = new RangePage(mainTab.getContentComposite(), - SWT.NONE); + DABaseComposite rangePage = new RangePage( + mainTab.getContentComposite(), SWT.NONE); DATabButton rangeTab = mainTab.addView(null, rangePage, true, true); rangeTab.addCloseButtonListener(new DACustomButtonClickEventListener() { @Override @@ -174,10 +174,10 @@ public class RangeDataManager implements Runnable { public List getPidsOfProfileDataMakerMap() { ArrayList pids = new ArrayList(); - pids.addAll(getProfileDataMakerMap().keySet()); + pids.addAll(getProfileDataMakerMap().keySet()); return pids; } - + public synchronized HashMap getProfileDataMakerMap() { if (DACommunicator.isSWAPVersion()) { if (null == swapProfileDataMakerMap) { @@ -188,13 +188,13 @@ public class RangeDataManager implements Runnable { if (null == profileDataMakerMap) { profileDataMakerMap = new HashMap(); } - return profileDataMakerMap; + return profileDataMakerMap; } } - + public ProfileDataMaker getProfileDataMakerByPid(int pid) { ProfileDataMaker profileDataMaker = getProfileDataMakerMap().get(pid); - if(null == profileDataMaker) { + if (null == profileDataMaker) { if (DACommunicator.isSWAPVersion()) { profileDataMaker = new ProfileDataMaker(swapCallstackManager); } else { @@ -417,12 +417,12 @@ public class RangeDataManager implements Runnable { } } - AnalyzerUtil.changePage(RangePage.ID); + AnalyzerUtil.changePage(RangePage.pageID); final DAPageComposite page = AnalyzerManager.getCurrentPage(); Display.getDefault().syncExec(new Runnable() { @Override public void run() { - page.updatePage(); + page.updateView(); } }); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeFailedApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeFailedApiListView.java index 8dba098..2736d1b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeFailedApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeFailedApiListView.java @@ -32,11 +32,10 @@ import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiListView; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedApiTable; public class RangeFailedApiListView extends FailedApiListView { - public static final String ID = RangeFailedApiListView.class.getName(); public RangeFailedApiListView(Composite parent, int style) { super(parent, style); - viewContainer.setTitleText(SummaryLabels.FAILED_API_LIST_VIEW_TITLE); + setTitle(SummaryLabels.FAILED_API_LIST_VIEW_TITLE); ((FailedApiTable) tableComp).setRangeTable(true); tableComp.setTableName(SummaryLabels.RANGE_PAGE_FAILED_TABLE_NAME); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeLeakView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeLeakView.java index 71896ab..5303a95 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeLeakView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeLeakView.java @@ -33,11 +33,9 @@ import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView; public class RangeLeakView extends LeakView { - public static final String ID = RangeLeakView.class.getName(); - public RangeLeakView(Composite parent, int style) { super(parent, style); - viewContainer.setTitleText(SummaryLabels.LEAK_VIEW_TITLE_LEAK_CANDIDATE); + setTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK_CANDIDATE); ((LeakTable) treeComp).setRangeTable(true); treeComp.setTableName(SummaryLabels.RANGE_PAGE_LEAK_TABLE_NAME); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java index 9f45a59..c693319 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangePage.java @@ -32,14 +32,21 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class RangePage extends DAPageComposite { - public static final String ID = RangePage.class.getName(); + public static final String pageID = RangePage.class.getName(); + public static final String failedListViewID = RangeFailedApiListView.class + .getName(); + public static final String leakViewID = RangeLeakView.class.getName(); + public static final String profilingViewID = RangeProfilingView.class + .getName(); + public static final String warningListViewID = RangeWarningListView.class + .getName(); + public static final String warningDerailViewID = RangeWarningDetailView.class + .getName(); SashForm upperForm; SashForm bottomForm; @@ -48,8 +55,9 @@ public class RangePage extends DAPageComposite { public RangePage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_RANGE; - this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_RANGE_TOOLTIP); + setTitle(AnalyzerLabels.COOLBAR_AREA_RANGE); + this.setData(DAPageComposite.KEY_TOOLTIP, + ShortCutManager.COOLBAR_AREA_RANGE_TOOLTIP); this.setLayout(new FillLayout()); baseForm = new SashForm(this, SWT.VERTICAL); @@ -69,20 +77,13 @@ public class RangePage extends DAPageComposite { addView(leakView); // INFO_VIEW_INDEX = 2; - DATabComposite tabView = new DATabComposite(upperForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, + SWT.NONE, RangePage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { RangePage.failedListViewID, + RangePage.leakViewID, RangePage.warningListViewID }); addView(tabView); - { - SnapshotView currentView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - tabView.addView(currentView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { - RangeFailedApiListView.ID, RangeLeakView.ID, - RangeWarningListView.ID }); - tabView.addView(callstack, false); - } + upperForm.setWeights(new int[] { 37, 40, 23 }); bottomForm = new SashForm(baseForm, SWT.HORIZONTAL); @@ -107,8 +108,17 @@ public class RangePage extends DAPageComposite { } @Override - protected void setFormWeights() { - upperForm.setWeights(new int[] { 37, 100 - 37 - wRate, wRate }); - baseForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + upperForm.setWeights(new int[] { 37, 100 - 37 - wrate, wrate }); + baseForm.setWeights(new int[] { hrate, 100 - hrate }); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeProfilingView.java index a73fc6f..bb9ffb5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeProfilingView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeProfilingView.java @@ -28,24 +28,16 @@ package org.tizen.dynamicanalyzer.ui.range; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.nl.SummaryLabels; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingTable; public class RangeProfilingView extends FunctionUsageProfilingView { - public static final String ID = RangeProfilingView.class.getName(); - public RangeProfilingView(Composite parent, int style) { super(parent, style); - viewContainer - .setTitleText(SummaryLabels.FUNCTION_USER_PROFILING_VIEW_TITLE); + setTitle(SummaryLabels.FUNCTION_USER_PROFILING_VIEW_TITLE); ((ProfilingTable) treeComp).setRangeTable(true); treeComp.setTableName(SummaryLabels.RANGE_PAGE_PROFILING_TABLE_NAME); treeComp.setRangeTable(true); } - - @Override - public void updateLog(LogPackage logPack) { - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningDetailView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningDetailView.java index 6d1b00b..971df29 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningDetailView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningDetailView.java @@ -30,11 +30,10 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDetailView; public class RangeWarningDetailView extends WarningDetailView { - public static final String ID = RangeWarningDetailView.class.getName(); public RangeWarningDetailView(Composite parent, int style) { super(parent, style); - selectionViewId = RangeWarningListView.ID; + selectionViewId = RangePage.warningListViewID; isRange = true; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningListView.java index 87a7da8..d4e27e4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeWarningListView.java @@ -32,11 +32,10 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningListView; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningTable; public class RangeWarningListView extends WarningListView { - public static final String ID = RangeWarningListView.class.getName(); public RangeWarningListView(Composite parent, int style) { super(parent, style); - viewContainer.setTitleText(SummaryLabels.WARNING_LIST_VIEW_TITLE); + setTitle(SummaryLabels.WARNING_LIST_VIEW_TITLE); ((WarningTable) tableComp).setRangeTable(true); tableComp.setTableName(SummaryLabels.RANGE_PAGE_WARNING_TABLE_NAME); } 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 840499c..37aa9ce 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 @@ -33,18 +33,27 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; +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.leaks.LeakView; +import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDetailView; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningListView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class SummaryPage extends DAPageComposite { - public static final String ID = SummaryPage.class.getName(); + public static final String pageID = SummaryPage.class.getName(); + public static final String failedViewID = FailedApiListView.class.getName(); + public static final String leakViewID = LeakView.class.getName(); + public static final String profilingViewID = FunctionUsageProfilingView.class + .getName(); + public static final String warningListViewID = WarningListView.class + .getName(); + public static final String warningDetailViewID = WarningDetailView.class + .getName(); + public final static int FAILED_APILIST_VIEW_INDEX = 0; public final static int LEAK_VIEW_INDEX = 1; public final static int INFO_VIEW_INDEX = 2; @@ -59,8 +68,9 @@ public class SummaryPage extends DAPageComposite { public SummaryPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_SUMMARY; - this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_SUMMARY_TOOLTIP); + setTitle(AnalyzerLabels.COOLBAR_AREA_SUMMARY); + this.setData(DAPageComposite.KEY_TOOLTIP, + ShortCutManager.COOLBAR_AREA_SUMMARY_TOOLTIP); this.setLayout(new FillLayout()); baseForm = new SashForm(this, SWT.VERTICAL); @@ -78,21 +88,16 @@ public class SummaryPage extends DAPageComposite { addView(leakView); // INFO_VIEW_INDEX = 2; - DATabComposite tabView = new DATabComposite(upperForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, + SWT.NONE, SummaryPage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { SummaryPage.failedViewID, + SummaryPage.leakViewID, SummaryPage.warningListViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { SummaryPage.failedViewID, + SummaryPage.leakViewID, SummaryPage.warningListViewID }); addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - tabView.addView(snapshotView, false); - snapshotView.setObservingViews(new String[] { FailedApiListView.ID, - LeakView.ID, WarningListView.ID }); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { FailedApiListView.ID, - LeakView.ID, WarningListView.ID }); - tabView.addView(callstack, false); - } + upperForm.setWeights(new int[] { 37, 40, 23 }); bottomForm = new SashForm(baseForm, SWT.HORIZONTAL); @@ -114,16 +119,28 @@ public class SummaryPage extends DAPageComposite { warningForm, SWT.NONE); addView(warningDetailView); warningForm.setWeights(new int[] { 70, 30 }); - + baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); upperForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); warningForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); + + DataManagerRegistry.registerPageDataManager(FunctionUsageProfiler + .getInstance()); } @Override - protected void setFormWeights() { - upperForm.setWeights(new int[] { 37, 100 - 37 - wRate, wRate }); - baseForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + upperForm.setWeights(new int[] { 37, 100 - 37 - wrate, wrate }); + baseForm.setWeights(new int[] { hrate, 100 - hrate }); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java index 51bb18b..fa7c807 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java @@ -31,21 +31,17 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.SummaryLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class FailedApiListView extends DAView { - public static final String ID = FailedApiListView.class.getName(); +public class FailedApiListView extends DAViewComposite { protected DATableComposite tableComp = null; - protected int[] innerMaxWeight = { 100, 0, 0 }; - protected int[] outerMaxWeight = { 100, 0 }; - protected String[] columnNames = { SummaryLabels.FAILED_API_LIST_VIEW_INDEX, SummaryLabels.FAILED_API_LIST_VIEW_TIME, @@ -66,16 +62,14 @@ public class FailedApiListView extends DAView { AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING }; - protected ViewContainer viewContainer = null; public FailedApiListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(SummaryLabels.FAILED_API_LIST_VIEW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); - Composite contents = viewContainer.getContentArea(); + setTitle(SummaryLabels.FAILED_API_LIST_VIEW_TITLE); + + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); @@ -97,8 +91,13 @@ public class FailedApiListView extends DAView { } @Override + public void updateView(DAViewData data) { + // other view selection occurred + tableComp.deselectAll(); + } + + @Override public void clear() { - // TODO Auto-generated method stub tableComp.clear(); } @@ -107,8 +106,4 @@ public class FailedApiListView extends DAView { return tableComp; } - @Override - public void otherViewSelectionOccured() { - tableComp.deselectAll(); - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java index be78dd4..73e3c8d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java @@ -40,7 +40,8 @@ import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.listeners.SummaryMouseDoubleClickListener; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.range.RangeFailedApiListView; +import org.tizen.dynamicanalyzer.ui.range.RangePage; +import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; @@ -61,21 +62,21 @@ public class FailedApiTable extends DATableComposite { .getData(); long time = dataFormat.getLogData().getTime(); - String id = FailedApiListView.ID; + String id = SummaryPage.failedViewID; if (isRange) { - id = RangeFailedApiListView.ID; + id = RangePage.failedListViewID; } DASelectionData selData = new DASelectionData(id, time, 0, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(id); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override public void widgetDefaultSelected(SelectionEvent e) { } }); - table.addMouseListener(new SummaryMouseDoubleClickListener()); + table.addMouseListener(new SummaryMouseDoubleClickListener( + SummaryPage.failedViewID)); } public void setRangeTable(boolean isRange) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java index 3f8d89f..6712caf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java @@ -43,7 +43,8 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.listeners.SummaryMouseDoubleClickListener; import org.tizen.dynamicanalyzer.model.TreeInput; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.range.RangeLeakView; +import org.tizen.dynamicanalyzer.ui.range.RangePage; +import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; @@ -84,24 +85,23 @@ public class LeakTable extends DATreeComposite { String timeStr = dataFormat.getData().get(LeakData.INDEX_TIME); long time = Long.parseLong(timeStr); - String id = LeakView.ID; + String id = SummaryPage.leakViewID; if (isRange) { - id = RangeLeakView.ID; + id = RangePage.leakViewID; } DASelectionData selData = new DASelectionData(id, time, 0, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(id); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - + // do nothing } }); - table.addMouseListener(new SummaryMouseDoubleClickListener()); + table.addMouseListener(new SummaryMouseDoubleClickListener( + SummaryPage.leakViewID)); } public void setRangeTable(boolean isRange) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java index 4471f82..671363b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakView.java @@ -31,22 +31,16 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.SummaryLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; import org.tizen.dynamicanalyzer.ui.widgets.table.TreeDataComparator; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class LeakView extends DAView { - - public static final String ID = LeakView.class.getName(); - - protected int[] innerMaxWeight = { 0, 100, 0 }; - protected int[] outerMaxWeight = { 100, 0 }; - +public class LeakView extends DAViewComposite { protected String[] columnNames = { SummaryLabels.LEAK_VIEW_NAME, SummaryLabels.LEAK_VIEW_PID, SummaryLabels.LEAK_VIEW_INDEX, SummaryLabels.LEAK_VIEW_TYPE, SummaryLabels.LEAK_VIEW_TIME, @@ -64,17 +58,13 @@ public class LeakView extends DAView { protected DATreeComposite treeComp = null; - protected ViewContainer viewContainer = null; - public LeakView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(SummaryLabels.LEAK_VIEW_TITLE_LEAK); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(SummaryLabels.LEAK_VIEW_TITLE_LEAK); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); treeComp = new LeakTable(contents, SWT.NONE, SWT.SINGLE | SWT.BORDER @@ -100,6 +90,12 @@ public class LeakView extends DAView { } @Override + public void updateView(DAViewData data) { + // other view selection occurred + treeComp.deselectAll(); + } + + @Override public void clear() { treeComp.clear(); } @@ -108,13 +104,4 @@ public class LeakView extends DAView { public Control getControl() { return treeComp; } - - @Override - public void otherViewSelectionOccured() { - treeComp.deselectAll(); - } - - public void setViewTitle(String title) { - viewContainer.setTitleText(title); - } } 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 8c28ce0..a7b8e0d 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 @@ -31,16 +31,19 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.SummaryLabels; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -public class FunctionUsageProfiler implements Runnable { +public class FunctionUsageProfiler extends PageDataManager { // default sampling rate = 10 ms public static long SAMPLE_TIME = 10; @@ -57,8 +60,6 @@ public class FunctionUsageProfiler implements Runnable { * key: symbol(child) or file path (parent) - value : sequence num of * profiling data. all parent and child data is in */ - private List> sampleInputs = null; - private static Thread profiler = null; public List getPidsOfProfileDataMakerMap() { ArrayList pids = new ArrayList(); @@ -86,112 +87,42 @@ public class FunctionUsageProfiler implements Runnable { public static synchronized FunctionUsageProfiler getInstance() { if (null == instance) { - SAMPLE_TIME = ConfigurationDialogDataManager.getInstance() - .getfeatureValue(ConfigureLabels - .FUNCTION_PROFILING_SAMPLING_PERIODIC); instance = new FunctionUsageProfiler(); } return instance; } - private synchronized List> getSampleInputs() { - if (null == sampleInputs) { - sampleInputs = new ArrayList>(); - } - return sampleInputs; - } - - private synchronized List getFirstSample() { - while (isSampleInputEmpty()) { - if (AnalyzerManager.isLogParsingComplete()) { - return null; - } - try { - wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - continue; - } - } - List first = getSampleInputs().get(0); - getSampleInputs().remove(0); - notifyAll(); - return first; - } - - private boolean isSampleInputEmpty() { - return getSampleInputs().isEmpty(); - } - - private boolean isSampleInputFull() { - if (getSampleInputs().size() > 10000) { - return true; - } - return false; - } - - public synchronized void pushSample(List sample) { - while (isSampleInputFull()) { - try { - wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - break; - } - } - getSampleInputs().add(sample); - notifyAll(); - } - - public static synchronized void startProfiler() { - if (null == profiler || !profiler.isAlive()) { - profiler = new Thread(null, getInstance(), - AnalyzerConstants.LOG_QUEUE_OBSERVING_THREAD); - profiler.start(); - } - } - - public static synchronized void stopProfiler() { - if (null != profiler && profiler.isAlive()) { - try { - sendNotify(); - profiler.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("profiling thread joined!"); //$NON-NLS-1$ - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - /*** profiling thread ***/ @Override public void run() { - System.out.println("start profiling thread"); //$NON-NLS-1$ + SAMPLE_TIME = ConfigurationDialogDataManager + .getInstance() + .getfeatureValue( + ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC); + while (!AnalyzerManager.isExit()) { - List sample = getInstance().getFirstSample(); - if (null == sample) { + LogPackage pack = pollPack(); + if (pack == null) // stop thread break; - } - int size = sample.size(); - for (int i = 0; i < size; i++) { - getInstance().getProfileDataMakerByPid(sample.get(i).getPid()) - .makeFunctionUsageProfileData( - (ProfileData) sample.get(i)); + + Logs logs = pack.getLogs(DataChannelConstants.MSG_DATA_SAMPLE); + if (null != logs && logs.getRawLogs().size() != 0) { + List sample = logs.getLogs(); + int size = sample.size(); + for (int i = 0; i < size; i++) { + getInstance().getProfileDataMakerByPid( + sample.get(i).getPid()) + .makeFunctionUsageProfileData( + (ProfileData) sample.get(i)); + } } } /* log for debug */ - System.out.println("profiling thread end!!"); //$NON-NLS-1$ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public static void clear() { instance = null; } - - public static void sendNotify() { - FunctionUsageProfiler p = getInstance(); - synchronized (p) { - p.notifyAll(); - } - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java index 3c7fb9d..814f3d1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java @@ -35,22 +35,14 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.model.ColumnData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.SummaryLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -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.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class FunctionUsageProfilingView extends DAView { - - public static final String ID = FunctionUsageProfilingView.class.getName(); +public class FunctionUsageProfilingView extends DAViewComposite { protected ProfilingTable treeComp = null; - protected int[] innerMaxWeight = { 100, 0 }; - protected int[] outerMaxWeight = { 0, 100 }; protected List columnData = null; protected String[] columnNames = { @@ -73,17 +65,13 @@ public class FunctionUsageProfilingView extends DAView { AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM }; - protected ViewContainer viewContainer = null; - public FunctionUsageProfilingView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(SummaryLabels.FUNCTION_USER_PROFILING_VIEW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); - Composite contents = viewContainer.getContentArea(); + setTitle(SummaryLabels.FUNCTION_USER_PROFILING_VIEW_TITLE); + + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); treeComp = new ProfilingTable(contents, SWT.NONE, SWT.SINGLE @@ -136,6 +124,12 @@ public class FunctionUsageProfilingView extends DAView { public void updateView() { treeComp.updateTree(); } + + @Override + public void updateView(DAViewData data) { + // other view selection occurred + treeComp.deselectAll(); + } @Override public void clear() { @@ -146,19 +140,4 @@ public class FunctionUsageProfilingView extends DAView { public Control getControl() { return treeComp; } - - @Override - public void otherViewSelectionOccured() { - treeComp.deselectAll(); - } - - @Override - public void updateLog(LogPackage logPack) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_DATA_SAMPLE); - if (null == logs || logs.getRawLogs().size() == 0) { - return; - } - List inputs = logs.getLogs(); - FunctionUsageProfiler.getInstance().pushSample(inputs); - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingTable.java index d24afa4..52ff78c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfilingTable.java @@ -49,7 +49,8 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.ColumnData; import org.tizen.dynamicanalyzer.model.TreeInput; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.range.RangeProfilingView; +import org.tizen.dynamicanalyzer.ui.range.RangePage; +import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; @@ -58,7 +59,6 @@ import org.tizen.dynamicanalyzer.ui.widgets.table.TreeDataComparator; import org.tizen.dynamicanalyzer.utils.Formatter; public class ProfilingTable extends DATreeComposite { - public static final String ID = ProfilingTable.class.getName(); private boolean isRange = false; public ProfilingTable(Composite parent, int compStyle, int tableStyle) { @@ -91,14 +91,13 @@ public class ProfilingTable extends DATreeComposite { public void widgetSelected(SelectionEvent e) { GridItem[] items = table.getSelection(); - String id = FunctionUsageProfilingView.ID; + String id = SummaryPage.profilingViewID; if (isRange) { - id = RangeProfilingView.ID; + id = RangePage.profilingViewID; } DASelectionData selData = new DASelectionData(id, 0, 0, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(id); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override @@ -110,14 +109,12 @@ public class ProfilingTable extends DATreeComposite { @Override public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub - + // do nothing } @Override public void mouseDown(MouseEvent e) { - // TODO Auto-generated method stub - + // do nothing } @Override 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 d80b285..1779c7c 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 @@ -38,17 +38,16 @@ 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.model.DAView; 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.SummaryPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class WarningDetailView extends DAView { - - public String ID = WarningDetailView.class.getName(); - +public class WarningDetailView extends DAViewComposite { protected boolean isRange = false; protected Canvas canvas = null; @@ -57,12 +56,12 @@ public class WarningDetailView extends DAView { protected String selectionViewId = null; public WarningDetailView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); canvas = new Canvas(this, SWT.NONE); canvas.addPaintListener(detailPaintListener); canvas.setBackground(ColorResources.DIALOG_BG_UPPER); - selectionViewId = WarningListView.ID; + selectionViewId = SummaryPage.warningListViewID; } protected PaintListener detailPaintListener = new PaintListener() { @@ -95,30 +94,37 @@ public class WarningDetailView extends DAView { }; @Override - public void updateView(DASelectionData data) { - if (data.getViewId().equals(selectionViewId)) { - GridItem[] items = (GridItem[]) data.getData(); - if (items.length <= 0) { - return; - } - GridItem item = items[0]; - DATableDataFormat tableData = (DATableDataFormat) item.getData(); - int seq = tableData.getLogData().getSeq(); + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + + if (data.getViewID().equals(selectionViewId)) { + GridItem[] items = (GridItem[]) data.getData(); + if (items.length <= 0) { + return; + } + GridItem item = items[0]; + DATableDataFormat tableData = (DATableDataFormat) item + .getData(); + int seq = tableData.getLogData().getSeq(); - WarningChecker warningChecker = null; - if (isRange) { - warningChecker = RangeDataManager.getInstance() - .getWarningChecker(); - } else { - warningChecker = AnalyzerManager.getWarningChecker(); - } - WarningData warning = warningChecker.getWarningDataByLogSeq(seq); - if (null == warning) { - warningMessage = CommonConstants.EMPTY; - } else { - warningMessage = WarningChecker.messageMaker(warning, false); + WarningChecker warningChecker = null; + if (isRange) { + warningChecker = RangeDataManager.getInstance() + .getWarningChecker(); + } else { + warningChecker = AnalyzerManager.getWarningChecker(); + } + WarningData warning = warningChecker + .getWarningDataByLogSeq(seq); + if (null == warning) { + warningMessage = CommonConstants.EMPTY; + } else { + warningMessage = WarningChecker + .messageMaker(warning, false); + } + canvas.redraw(); } - canvas.redraw(); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningListView.java index f1a1291..7e86a29 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningListView.java @@ -32,21 +32,16 @@ import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.SummaryLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class WarningListView extends DAView { - - public static final String ID = WarningListView.class.getName(); - - protected int[] innerMaxWeight = { 0, 100 }; - protected int[] outerMaxWeight = { 0, 100 }; - +public class WarningListView extends DAViewComposite { protected DATableComposite tableComp = null; protected String[] columnNames = { SummaryLabels.WARNING_LIST_VIEW_INDEX, SummaryLabels.WARNING_LIST_VIEW_CATEGORY, @@ -57,17 +52,14 @@ public class WarningListView extends DAView { protected int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_GRID, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_GRID }; - protected ViewContainer viewContainer = null; public WarningListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(SummaryLabels.WARNING_LIST_VIEW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(SummaryLabels.WARNING_LIST_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new WarningTable(contents, SWT.NONE, SWT.SINGLE @@ -86,6 +78,12 @@ public class WarningListView extends DAView { public void updateView() { tableComp.updateTable(); } + + @Override + public void updateView(DAViewData data) { + // other view selection occurred + tableComp.deselectAll(); + } @Override public void clear() { @@ -98,41 +96,27 @@ public class WarningListView extends DAView { } @Override - public void otherViewSelectionOccured() { - tableComp.deselectAll(); - } - - @Override - public void setMaxSize(boolean maximized) { - - if (null == innerMaxWeight || null == outerMaxWeight) { - return; - } - + protected void setMaxSize(boolean maximized) { + int count = 0; + Control current = this; Composite parent = getParent(); - if (parent instanceof SashForm) { - parent = parent.getParent(); - if (!(parent instanceof SashForm)) { - return; + while (parent != null) { + if ((parent instanceof DAPageComposite) + && ((DAPageComposite) parent).isToplevel()) + break; + + if (parent instanceof SashForm) { + // ignore first sash form to maximize + // because of WarningDetailView + if (count++ != 0) { + if (maximized) + ((SashForm) parent).setMaximizedControl(current); + else + ((SashForm) parent).setMaximizedControl(null); + } } - } - - Composite pParent = parent.getParent(); - if (!(pParent instanceof SashForm)) { - return; - } - - SashForm innerForm = (SashForm) parent; - SashForm outerForm = (SashForm) pParent; - - if (maximized) { - oldInnerLayout = innerForm.getWeights(); - oldOuterLayout = outerForm.getWeights(); - innerForm.setWeights(innerMaxWeight); - outerForm.setWeights(outerMaxWeight); - } else { - innerForm.setWeights(oldInnerLayout); - outerForm.setWeights(oldOuterLayout); + current = parent; + parent = parent.getParent(); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java index c413e70..a612366 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java @@ -39,7 +39,8 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.listeners.SummaryMouseDoubleClickListener; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.range.RangeWarningListView; +import org.tizen.dynamicanalyzer.ui.range.RangePage; +import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; @@ -59,24 +60,22 @@ public class WarningTable extends DATableComposite { .getData(); long time = dataFormat.getLogData().getTime(); - String id = WarningListView.ID; + String id = SummaryPage.warningListViewID; if (isRange) { - id = RangeWarningListView.ID; + id = RangePage.warningListViewID; } DASelectionData selData = new DASelectionData(id, time, 0, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection(id); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - } }); - table.addMouseListener(new SummaryMouseDoubleClickListener()); + table.addMouseListener(new SummaryMouseDoubleClickListener( + SummaryPage.warningListViewID)); } public void setRangeTable(boolean isRange) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java index eb187fd..44db89c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java @@ -38,18 +38,14 @@ import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; -import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; 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.widgets.chart.DAChartPlotIntervalMarker; -import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; public class ThreadAPIListTable extends DAApiListTableComposite { - private DAChartBoard chartBoard = null; - + public ThreadAPIListTable(Composite parent, int compStyle, int tableStyle) { super(parent, compStyle, tableStyle); table.addSelectionListener(new SelectionListener() { @@ -79,16 +75,13 @@ public class ThreadAPIListTable extends DAApiListTableComposite { } DASelectionData selData = new DASelectionData( - ThreadAPIListView.ID, startTime, endTime, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - ThreadAPIListView.ID); + ThreadPage.listViewID, startTime, endTime, items, table); + AnalyzerManager.getCurrentPage().updateView(selData); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub - + // do nothing } }); } @@ -96,7 +89,7 @@ public class ThreadAPIListTable extends DAApiListTableComposite { @Override protected List makeTableInput() { ThreadAPIListView view = (ThreadAPIListView) AnalyzerManager - .getCurrentPage().getViewMap().get(ThreadAPIListView.ID); + .getCurrentPage().getView(ThreadPage.listViewID); ThreadPageData data = view.getPageData(); long rangeStartTime = view.getAnalysisStartTime(); @@ -113,39 +106,39 @@ public class ThreadAPIListTable extends DAApiListTableComposite { ThreadPageDataEvent content; for (int i = 0; i < contents.size(); i++) { content = contents.get(i); - ProbeCommonData contentTemp = (ProbeCommonData) content.getContents(); + ProbeCommonData contentTemp = (ProbeCommonData) content + .getContents(); int selectedPid = ToolbarArea.getInstance().getSelectedPid(); if (selectedPid != 0) { if (selectedPid != contentTemp.getPid()) { continue; } - } + } List contentText = new ArrayList(); List contentData = new ArrayList(); - String seq = Integer.toString(contentTemp.getSeq()); contentText.add(0, seq); contentData.add(seq); - + contentText.add(Formatter.toTimeFormat(contentTemp.getTime())); contentData.add(Long.toString(contentTemp.getTime())); - + contentText.add(Integer.toString(contentTemp.getPid())); contentData.add(Integer.toString(contentTemp.getPid())); - + contentText.add(Long.toString(contentTemp.getTid())); contentData.add(Long.toString(contentTemp.getTid())); - + contentText.add(contentTemp.getApiName()); contentData.add(contentTemp.getApiName()); - + contentText.add(contentTemp.getArgs()); contentData.add(contentTemp.getArgs()); - + contentText.add(contentTemp.getReturn()); contentData.add(contentTemp.getReturn()); - + String errMsg = ErrorCodeManager.getInatance() .getErrorCode(contentTemp.getErrno()).name(); if (null == errMsg) { @@ -161,7 +154,7 @@ public class ThreadAPIListTable extends DAApiListTableComposite { TableInput tableInput = new TableInput(); tableInput.setText(contentText); tableInput.setData(tableData); - if(!errMsg.contains("SUCCESS") ){//$NON-NLS-1$ + if (!errMsg.contains("SUCCESS")) {//$NON-NLS-1$ tableInput.setFailed(true); } input.add(tableInput); @@ -175,14 +168,6 @@ public class ThreadAPIListTable extends DAApiListTableComposite { return input; } - private DAChartBoard getChartBoard() { - if (chartBoard == null) { - chartBoard = (DAChartBoard) (AnalyzerManager.getCurrentPage() - .getView(ThreadChartView.ID).getControl()); - } - return chartBoard; - } - protected void actionSetStartEnd(int type) { GridItem item = table.getItem(mousePoint); if (null != item) { @@ -190,7 +175,6 @@ public class ThreadAPIListTable extends DAApiListTableComposite { long inputTime = data.getTime(); double startTime = -1; double endTime = -1; - DAChartBoard board = getChartBoard(); if (type == START_TIME) { rangeDataManager.setMarkerStartTime(inputTime); @@ -205,12 +189,10 @@ public class ThreadAPIListTable extends DAApiListTableComposite { / TimelineConstants.MEGA_DOUBLE; } - board.setTimelineMarkerStartTime(startTime); - board.setTimelineMarkerEndTime(endTime); + ThreadChartView chartview = (ThreadChartView) (AnalyzerManager + .getCurrentPage().getView(ThreadPage.chartViewID)); - ((DAChartPlotIntervalMarker) board.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)) - .setInterval(startTime, endTime); + chartview.setRangeMarker(startTime, endTime); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListView.java index ce4fe7f..9ab4cb3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListView.java @@ -32,25 +32,21 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class ThreadAPIListView extends DAView { - - public static final String ID = ThreadAPIListView.class.getName(); +public class ThreadAPIListView extends DAViewComposite { private ThreadPageData data; private long analysisStartTime = 0; private long analysisEndTime = 0; private long selectionStartTime = 0; private long selectionEndTime = 0; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 100, 0 }; - private int preSelectionPid = -1; + private int preSelectionPid = -1; private String[] columnNames = { ThreadPageLabels.THREAD_API_LIST_VIEW_INDEX, @@ -59,47 +55,44 @@ public class ThreadAPIListView extends DAView { ThreadPageLabels.THREAD_API_LIST_VIEW_THREAD_ID, ThreadPageLabels.THREAD_API_LIST_VIEW_NAME, ThreadPageLabels.THREAD_API_LIST_VIEW_PARAMETER, - ThreadPageLabels.THREAD_API_LIST_VIEW_RETURN, + ThreadPageLabels.THREAD_API_LIST_VIEW_RETURN, ThreadPageLabels.THREAD_API_LIST_VIEW_ERRNO }; private int[] columnSizes = { 35, 70, 45, 45, 180, 240, 75, 100 }; - private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT,SWT.LEFT, SWT.LEFT, SWT.LEFT, - SWT.LEFT, SWT.LEFT, SWT.LEFT }; + private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, + SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT }; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM, + AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, - AnalyzerConstants.SORT_TYPE_NUM, - AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING }; -// int[] sourceColumns = { LogCenterConstants.SEQUENCE_NUMBER_INDEX, -// LogCenterConstants.TIME_INDEX, LogCenterConstants.APINAME_INDEX, -// LogCenterConstants.INPUTPARM_INDEX, -// LogCenterConstants.THREAD_ID_INDEX, -// LogCenterConstants.RETURN_INDEX, LogCenterConstants.ERROR_INDEX }; + // int[] sourceColumns = { LogCenterConstants.SEQUENCE_NUMBER_INDEX, + // LogCenterConstants.TIME_INDEX, LogCenterConstants.APINAME_INDEX, + // LogCenterConstants.INPUTPARM_INDEX, + // LogCenterConstants.THREAD_ID_INDEX, + // LogCenterConstants.RETURN_INDEX, LogCenterConstants.ERROR_INDEX }; ThreadAPIListTable tableComp = null; public ThreadAPIListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(ThreadPageLabels.THREAD_API_LIST_VEIW_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(ThreadPageLabels.THREAD_API_LIST_VEIW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new ThreadAPIListTable(contents, SWT.NONE, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL); tableComp.setTableName("Thread API List"); tableComp.setSortTypes(sortTypes); -// tableComp.setSourceColumns(sourceColumns); + // tableComp.setSourceColumns(sourceColumns); tableComp.setColumnAlignment(columnAlignment); tableComp.setColumns(columnNames); tableComp.setColumnSize(columnSizes); @@ -150,22 +143,25 @@ public class ThreadAPIListView extends DAView { } @Override - public void updateView(DASelectionData data) { - ThreadPageData pageData; - - if (data.getData() instanceof ThreadPageData) { - pageData = (ThreadPageData) data.getData(); - this.data = pageData; - } else if (data.getData() instanceof Integer) { - this.data = null; + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + ThreadPageData pageData; + + if (data.getData() instanceof ThreadPageData) { + pageData = (ThreadPageData) data.getData(); + this.data = pageData; + } else if (data.getData() instanceof Integer) { + this.data = null; + } + + selectionStartTime = data.getStartTime(); + selectionEndTime = data.getEndTime(); + + tableComp.getTable().removeAll(); + tableComp.updateTable(); + tableComp.setSelectionByTime(selectionStartTime, selectionEndTime); } - - selectionStartTime = data.getStartTime(); - selectionEndTime = data.getEndTime(); - - tableComp.getTable().removeAll(); - tableComp.updateTable(); - tableComp.setSelectionByTime(selectionStartTime, selectionEndTime); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java index 5f151ae..9c5fad0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java @@ -28,33 +28,26 @@ package org.tizen.dynamicanalyzer.ui.thread; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.logparser.LogListQueue; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncDataManager; import org.tizen.dynamicanalyzer.ui.thread.thread.ThreadPageThreadDataManager; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; -public class ThreadChartManager implements Runnable { - - private LogListQueue logListQueue = null; - private Thread updateLogThread = null; +public class ThreadChartManager extends PageDataManager { private static ThreadChartManager instance = null; private ThreadPageThreadDataManager tManager; private ThreadPageSyncDataManager sManager; - + private ThreadChartManager() { tManager = new ThreadPageThreadDataManager(null); sManager = new ThreadPageSyncDataManager(null); - if (null == logListQueue) { - logListQueue = new LogListQueue(); - } } public static ThreadChartManager getInstance() { @@ -67,40 +60,6 @@ public class ThreadChartManager implements Runnable { public ThreadPageThreadDataManager getThreadDataManager() { return tManager; } - - public LogListQueue getLogListQueue() { - if (null == logListQueue) { - logListQueue = new LogListQueue(); - } - return logListQueue; - } - - public void startUpdateLogThread() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - updateLogThread = new Thread(null, getInstance(), - AnalyzerConstants.THREAD_CHART_MANAGER_THREAD); - updateLogThread.start(); - } - } - - public void stopUpdateLogThread() { - if (null != updateLogThread && updateLogThread.isAlive()) { - try { - sendNotify(); - updateLogThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("thread chart manager joined!"); //$NON-NLS-1$ - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - public static void sendNotify() { - LogListQueue logListQueue = getInstance().getLogListQueue(); - synchronized (logListQueue) { - logListQueue.notifyAll(); - } - } private List getLogsFromLogPackage(LogPackage logPack, int logCenterConstants) { @@ -113,32 +72,6 @@ public class ThreadChartManager implements Runnable { return ret; } - public void updateLog(LogPackage logPack) { - List loadInputs = getLogsFromLogPackage(logPack, - DataChannelConstants.MSG_DATA_SYSTEM); - - if (null != loadInputs) { - logListQueue.putLog(loadInputs); - } - - List threadInputs = getLogsFromLogPackage(logPack, - DataChannelConstants.MSG_PROBE_THREAD); - - if (null != threadInputs) { - logListQueue.putLog(threadInputs); - } - - List syncInputs = getLogsFromLogPackage(logPack, - DataChannelConstants.MSG_PROBE_SYNC); - - if (null != syncInputs) { - logListQueue.putLog(syncInputs); - } - - // tManager.parsePageData(logPack); - // sManager.parsePageData(logPack); - } - public void update() { tManager.checkUpdate(); sManager.checkUpdate(); @@ -152,30 +85,41 @@ public class ThreadChartManager implements Runnable { @Override public void run() { while (!AnalyzerManager.isExit()) { - List logs = logListQueue.getFirst(); - if (null == logs) { + LogPackage pack = pollPack(); + if (pack == null) // stop thread; break; + + List loadInputs = getLogsFromLogPackage(pack, + DataChannelConstants.MSG_DATA_SYSTEM); + if (null != loadInputs) { + int logSize = loadInputs.size(); + for (int i = 0; i < logSize; i++) { + tManager.parseLoad(loadInputs.get(i)); + } + } + + List threadInputs = getLogsFromLogPackage(pack, + DataChannelConstants.MSG_PROBE_THREAD); + if (null != threadInputs) { + int logSize = threadInputs.size(); + for (int i = 0; i < logSize; i++) { + tManager.parseAPI(threadInputs.get(i)); + } } - int logSize = logs.size(); - LogData log; - int logType; - for (int i = 0; i < logSize; i++) { - log = logs.get(i); - logType = log.getId(); - if (logType == DataChannelConstants.MSG_DATA_SYSTEM) { - tManager.parseLoad(log); - } else if (logType == DataChannelConstants.MSG_PROBE_THREAD) { - tManager.parseAPI(log); - } else if (logType == DataChannelConstants.MSG_PROBE_SYNC) { - tManager.parseSync(log); - sManager.parseSync(log); + List syncInputs = getLogsFromLogPackage(pack, + DataChannelConstants.MSG_PROBE_SYNC); + if (null != syncInputs) { + int logSize = syncInputs.size(); + for (int i = 0; i < logSize; i++) { + tManager.parseSync(syncInputs.get(i)); + sManager.parseSync(syncInputs.get(i)); } } } /* log for debug */ - System.out.println("thread manager thread end!!"); //$NON-NLS-1$ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public int getItemIndexByTid(String tid) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java index 4d19682..2554d6e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartView.java @@ -32,13 +32,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ThreadData; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; @@ -48,7 +45,6 @@ import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; @@ -56,10 +52,11 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardSelectionListener; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboSelectionListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class ThreadChartView extends DAView { - public static final String ID = ThreadChartView.class.getName(); +public class ThreadChartView extends DAViewComposite { public final static int THREAD_CHART_HEIGHT = 40; public final static int THREAD_COMBO_ITEM_HEIGHT = 24; @@ -76,13 +73,12 @@ public class ThreadChartView extends DAView { .getInstance(); public ThreadChartView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - viewContainer.setTitleText(ThreadPageLabels.THREAD_CHART_TITLE); + setTitle(ThreadPageLabels.THREAD_CHART_TITLE); - contents = viewContainer.getContentArea(); + contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); stackLayout = new StackLayout(); @@ -223,9 +219,9 @@ public class ThreadChartView extends DAView { if (null == selectItem) { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - ThreadChartView.ID, + ThreadPage.chartViewID, (long) (((DAChartPlotIntervalMarker) threadChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -238,9 +234,9 @@ public class ThreadChartView extends DAView { } else { AnalyzerManager .getCurrentPage() - .updatePage( + .updateView( new DASelectionData( - ThreadChartView.ID, + ThreadPage.chartViewID, (long) (((DAChartPlotIntervalMarker) threadChart .getMarkers() .get(UICommonConstants.SELECTION_MARKER_INDEX)) @@ -322,39 +318,54 @@ public class ThreadChartView extends DAView { ((DAChartPlotIntervalMarker) threadChart.getMarkers().get( UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - rangeDataManager.getMarkerStartTime() / TimelineConstants.MEGA_DOUBLE, - rangeDataManager.getMarkerEndTime() / TimelineConstants.MEGA_DOUBLE); + rangeDataManager.getMarkerStartTime() + / TimelineConstants.MEGA_DOUBLE, + rangeDataManager.getMarkerEndTime() + / TimelineConstants.MEGA_DOUBLE); ((DAChartPlotIntervalMarker) syncChart.getMarkers().get( UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - rangeDataManager.getMarkerStartTime() / TimelineConstants.MEGA_DOUBLE, - rangeDataManager.getMarkerEndTime() / TimelineConstants.MEGA_DOUBLE); + rangeDataManager.getMarkerStartTime() + / TimelineConstants.MEGA_DOUBLE, + rangeDataManager.getMarkerEndTime() + / TimelineConstants.MEGA_DOUBLE); } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - - double startTime = (double) start / TimelineConstants.MEGA_DOUBLE; - double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; -// double middleTime = (startTime + endTime) / 2.0; -// if (start == end) { -// middleTime = startTime; -// } - - DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; - -// chartBoard.setVisibleMiddleTime(middleTime); - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); - } + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; - @Override - public void updateLog(LogPackage logPack) { - manager.updateLog(logPack); + if (selData.isLogData()) { + Object odata = selData.getData(); + if (stackLayout.topControl.equals(syncChart)) { + changeComboSyncToThread(); + } + + String selectTid = Long.toString(((ThreadData) odata).getPThreadId()); + threadChart.selectItem(manager.getItemIndexByTid(selectTid)); + } else { + long start = selData.getStartTime(); + long end = selData.getEndTime(); + + double startTime = (double) start + / TimelineConstants.MEGA_DOUBLE; + double endTime = (double) end / TimelineConstants.MEGA_DOUBLE; + // double middleTime = (startTime + endTime) / 2.0; + // if (start == end) { + // middleTime = startTime; + // } + + DAChartBoard chartBoard = (DAChartBoard) stackLayout.topControl; + + // chartBoard.setVisibleMiddleTime(middleTime); + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get( + UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } + } } @Override @@ -372,16 +383,6 @@ public class ThreadChartView extends DAView { return stackLayout.topControl; } - @Override - public void setSelection(LogData data) { - if (stackLayout.topControl.equals(syncChart)) { - changeComboSyncToThread(); - } - - String selectTid = Long.toString(((ThreadData) data).getPThreadId()); - threadChart.selectItem(manager.getItemIndexByTid(selectTid)); - } - private void initIntervalMarkers(DAChartBoard board) { // selection marker DAChartPlotIntervalMarker selectionMarker = new DAChartPlotIntervalMarker( @@ -403,6 +404,16 @@ public class ThreadChartView extends DAView { rangeMarker.setForegroundColor(ColorResources.RED); rangeMarker.setAlpha((int) (255 * 0.25)); board.addIntervalMarker(rangeMarker); + } + + public void setRangeMarker(double starttime, double endtime) { + DAChartBoard currentChart = (DAChartBoard) stackLayout.topControl; + currentChart.setTimelineMarkerStartTime(starttime); + currentChart.setTimelineMarkerEndTime(endtime); + ((DAChartPlotIntervalMarker) currentChart.getMarkers().get( + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + starttime, endtime); } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadDetailInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadDetailInfoView.java index 312ca7e..e6b2dda 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadDetailInfoView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadDetailInfoView.java @@ -39,17 +39,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncData; import org.tizen.dynamicanalyzer.ui.thread.thread.ThreadPageThreadData; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class ThreadDetailInfoView extends DAView { - public static final String ID = ThreadDetailInfoView.class.getName(); +public class ThreadDetailInfoView extends DAViewComposite { public static final int LEFT_MARGIN = 10; public static final int HEIGHT_MARGIN = 20; @@ -62,9 +61,6 @@ public class ThreadDetailInfoView extends DAView { private ThreadPageData item = null; private boolean select = false; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - private void init() { tid = AnalyzerLabels.EMPTY_STRING; type = AnalyzerLabels.EMPTY_STRING; @@ -75,14 +71,12 @@ public class ThreadDetailInfoView extends DAView { } public ThreadDetailInfoView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(ThreadPageLabels.THREAD_DETAILS_TITLE); - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(ThreadPageLabels.THREAD_DETAILS_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.VIEW_BG_COLOR); contents.setLayout(new FillLayout()); canvas = new Canvas(contents, SWT.TRANSPARENT); @@ -210,20 +204,22 @@ public class ThreadDetailInfoView extends DAView { } @Override - public void updateView(DASelectionData data) { - String id = data.getViewId(); - if (!(id.equals(ThreadChartView.ID))) { - return; - } - if(data.getData() instanceof ThreadPageData){ - item = (ThreadPageData) data.getData(); - } - else{ - item = null; - select = false; - } + public void updateView(DAViewData vdata) { + if (vdata instanceof DASelectionData) { + DASelectionData data = (DASelectionData) vdata; + String id = data.getViewID(); + if (!(id.equals(ThreadPage.chartViewID))) { + return; + } + if (data.getData() instanceof ThreadPageData) { + item = (ThreadPageData) data.getData(); + } else { + item = null; + select = false; + } - updateDetails(); + updateDetails(); + } } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java index 6837310..c1eae3f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java @@ -33,13 +33,15 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class ThreadPage extends DAPageComposite { - public static final String ID = ThreadPage.class.getName(); + public static final String pageID = ThreadPage.class.getName(); + public static final String chartViewID = ThreadChartView.class.getName(); + public static final String listViewID = ThreadAPIListView.class.getName(); + public static final String detailViewID = ThreadDetailInfoView.class.getName(); SashForm baseForm; SashForm leftForm; @@ -47,7 +49,7 @@ public class ThreadPage extends DAPageComposite { public ThreadPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_THREAD; + setTitle(AnalyzerLabels.COOLBAR_AREA_THREAD); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_THREAD_TOOLTIP); this.setLayout(new FillLayout()); @@ -68,20 +70,14 @@ public class ThreadPage extends DAPageComposite { rightForm = new SashForm(baseForm, SWT.VERTICAL); // INFO_VIEW_INDEX = 2; - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); + + ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, + SWT.NONE, ThreadPage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { ThreadPage.listViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { ThreadPage.listViewID }); addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView - .setObservingViews(new String[] { ThreadAPIListView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { ThreadAPIListView.ID }); - tabView.addView(callstack, false); - } // FILE_DETAIL = 3; ThreadDetailInfoView detailInfo = new ThreadDetailInfoView(rightForm, @@ -94,11 +90,22 @@ public class ThreadPage extends DAPageComposite { baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); + + DataManagerRegistry.registerPageDataManager(ThreadChartManager.getInstance()); } @Override - protected void setFormWeights() { - baseForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + baseForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java index e36e7a7..e33815d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java @@ -33,22 +33,24 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.timeline.calltrace.CallTraceView; +import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class TimelinePage extends DAPageComposite { - public static final String ID = TimelinePage.class.getName(); + public static final String pageID = TimelinePage.class.getName(); + public static final String timelineViewID = TimelineView.class.getName(); + public static final String calltraceViewID = CallTraceView.class.getName(); SashForm leftForm; SashForm rightForm; public TimelinePage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_TIMELINE; + setTitle(AnalyzerLabels.COOLBAR_AREA_TIMELINE); this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_TIMELINE_TOOLTIP); this.setLayout(new FillLayout()); @@ -62,19 +64,13 @@ public class TimelinePage extends DAPageComposite { rightForm = new SashForm(leftForm, SWT.VERTICAL); // index 1 : INFO_INDEX - DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(rightForm, + SWT.NONE, TimelinePage.pageID); + tabView.setObservingViews(ScreenshotTabComposite.screenshotViewID, + new String[] { TimelinePage.timelineViewID }); + tabView.setObservingViews(ScreenshotTabComposite.callstackViewID, + new String[] { TimelinePage.calltraceViewID }); addView(tabView); - { - SnapshotView snapshotView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - snapshotView.setObservingViews(new String[] { TimelineView.ID }); - tabView.addView(snapshotView, false); - - CallstackView callstack = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstack.setObservingViews(new String[] { CallTraceView.ID }); - tabView.addView(callstack, false); - } // index 2 : APILIST_INDEX CallTraceView apiListView = new CallTraceView(rightForm, SWT.NONE); @@ -85,11 +81,22 @@ public class TimelinePage extends DAPageComposite { leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); + + DataManagerRegistry.registerPageDataManager(TimelineChartManager.getInstance()); } @Override - protected void setFormWeights() { - leftForm.setWeights(new int[] { 100 - wRate, wRate }); - rightForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + leftForm.setWeights(new int[] { 100 - wrate, wrate }); + rightForm.setWeights(new int[] { hrate, 100 - hrate }); } } 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 0b10609..f1a8d25 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 @@ -50,6 +50,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite; @@ -76,9 +77,10 @@ public class CallTraceTable extends DAWindowingTableComposite { long startTime = startData.getTime(); long endTime = endData.getTime(); - DASelectionData data = new DASelectionData(CallTraceView.ID, - startTime, endTime, ti, table); - AnalyzerManager.getCurrentPage().updatePage(data); + DASelectionData data = new DASelectionData( + TimelinePage.calltraceViewID, startTime, endTime, ti, + table); + AnalyzerManager.getCurrentPage().updateView(data); } @Override @@ -205,7 +207,7 @@ public class CallTraceTable extends DAWindowingTableComposite { @Override protected String getTimeColumnName() { - String timestr = DBTableManager.COMMON_COLUMN_TIME; + String timestr = DBTableManager.COMMON_COLUMN_TIME; return timestr; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java index 1b11a73..eb15f45 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java @@ -32,22 +32,20 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.TimelinePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.WindowingTableColumnSizePackListener; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class CallTraceView extends DAView { - public static final String ID = CallTraceView.class.getName(); +public class CallTraceView extends DAViewComposite { private DAWindowingTableComposite tableComp; private String[] columnNames = { TimelinePageLabels.CALL_TRACE_VIEW_TIME, @@ -66,17 +64,13 @@ public class CallTraceView extends DAView { AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING }; - int[] innerMaxWeight = { 0, 100 }; - int[] outerMaxWeight = { 0, 100 }; - public CallTraceView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer.setTitleText(TimelinePageLabels.CALL_TRACE_VIEW_TITLE); + setTitle(TimelinePageLabels.CALL_TRACE_VIEW_TITLE); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new CallTraceTable(contents, SWT.NONE, SWT.MULTI @@ -88,25 +82,27 @@ public class CallTraceView extends DAView { tableComp.setItemHeightSize(16); contents.addControlListener(new WindowingTableColumnSizePackListener( tableComp, columnSizes)); - - setMaxWeight(innerMaxWeight, outerMaxWeight); } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - updateView(); - ((CallTraceTable) tableComp).setSelectionByTime(start, end); - updateView(); - /* only callstack update */ - // timeline view and tabcomp top view : callstack - if (selData.getViewId().equals(TimelineView.ID)) { - DATabComposite tabView = (DATabComposite) AnalyzerUtil.getView( - TimelinePage.ID, DATabComposite.ID); - Composite comp = tabView.getTopComposite(); - if (comp instanceof CallstackView) { - ((CallstackView) comp).updateView(); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + long start = selData.getStartTime(); + long end = selData.getEndTime(); + updateView(); + ((CallTraceTable) tableComp).setSelectionByTime(start, end); + updateView(); + + /* only callstack update */ + if (selData.getViewID().equals(TimelinePage.timelineViewID)) { + DATabComposite tabView = (DATabComposite) AnalyzerUtil.getView( + TimelinePage.pageID, ScreenshotTabComposite.tabID); + Composite comp = tabView.getTopComposite(); + if (comp instanceof CallstackView) { + ((CallstackView) comp).updateView(); + } } } } @@ -126,9 +122,4 @@ public class CallTraceView extends DAView { public Control getControl() { return tableComp; } - - @Override - public void updateLog(LogPackage logPack) { - - } } 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 52b6cef..30a8086 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 @@ -42,7 +42,7 @@ 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.ScreenShotData; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SocketClient; +import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; @@ -119,7 +119,7 @@ public class ScreenshotChart extends TimelineChart { if(DACommunicator.isTargetEmulator() && SocketClient.getInstance().isConnected()) { imagePathLog = DACommunicator.getSelectedDevice() - .emulatorSnapshot.getFilePath(); + .emulatorScreenshot.getFilePath(); } else { imagePathLog = logData.getImageFilePath(); } 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 95096c7..5c3173e 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 @@ -29,8 +29,12 @@ package org.tizen.dynamicanalyzer.ui.timeline.common; import java.util.ArrayList; import java.util.HashMap; import java.util.List; - +import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; +import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; +import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener; import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter; import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUChart; @@ -48,13 +52,16 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.SystemMemoryChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.UIEventChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.UserCustomChart; +import org.tizen.dynamicanalyzer.ui.timeline.logparser.CustomLogParser; +import org.tizen.dynamicanalyzer.ui.timeline.logparser.DeviceLogParser; +import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; -public class TimelineChartManager { +public class TimelineChartManager extends PageDataManager { private static TimelineChartManager instance = null; private boolean newCustomChart = false; @@ -63,10 +70,15 @@ public class TimelineChartManager { private List selectedChartList; private HashMap chartInstanceMapNameKey; private HashMap chartInstanceMapTypeKey; - + private HashMap customChartMap; private DAChartBoard chartBoard = null; + private DeviceLogParser deviceLogParser = null; + private CustomLogParser customLogParser = null; + private final LifecycleLogParser lifecycleLogParser = LifecycleLogParser + .getInstance(); + public static TimelineChartManager getInstance() { if (instance == null) { instance = new TimelineChartManager(); @@ -81,6 +93,9 @@ public class TimelineChartManager { chartInstanceMapNameKey = new HashMap(); chartInstanceMapTypeKey = new HashMap(); customChartMap = new HashMap(); + + deviceLogParser = new DeviceLogParser(this); + customLogParser = new CustomLogParser(this); initChartMap(CPUChart.getInstance()); initChartMap(CPUCoreChart.getInstance()); @@ -95,7 +110,7 @@ public class TimelineChartManager { initChartMap(NetworkIOChart.getInstance()); initChartMap(DeviceChart.getInstance()); initChartMap(EnergyChart.getInstance()); - + loadSavedChartList(); loadSelectedChartList(); } @@ -118,7 +133,7 @@ public class TimelineChartManager { } } } else { - for(TimelineChart chart : chartInstanceMapNameKey.values()) { + for (TimelineChart chart : chartInstanceMapNameKey.values()) { chartList.add(chart); } } @@ -168,11 +183,11 @@ public class TimelineChartManager { public TimelineChart getChartInstance(int chartType) { TimelineChart chart = chartInstanceMapTypeKey.get(chartType); - - if(chart == null) { + + if (chart == null) { chart = customChartMap.get(chartType); } - + return chart; } @@ -180,7 +195,7 @@ public class TimelineChartManager { chartInstanceMapNameKey.put(chart.getChartName(), chart); chartInstanceMapTypeKey.put(chart.getChartType(), chart); } - + public void addCustomChart(UserCustomChart customChart) { long chartType = customChart.getChartType(); if (!customChartMap.containsKey(chartType)) { @@ -277,5 +292,55 @@ public class TimelineChartManager { loadSavedChartList(); loadSelectedChartList(); customChartMap.clear(); + customLogParser.clear(); + } + + @Override + public void run() { + while (!AnalyzerManager.isExit()) { + LogPackage pack = pollPack(); + if (null == pack) // stop thread + break; + + Logs deviceLogs = pack + .getLogs(DataChannelConstants.MSG_DATA_SYSTEM); + if (deviceLogs != null && !deviceLogs.getRawLogs().isEmpty()) { + deviceLogParser.parseLogPackage(pack); + } + + Logs memoryLogs = pack + .getLogs(DataChannelConstants.MSG_PROBE_MEMORY); + if (memoryLogs != null && !memoryLogs.getRawLogs().isEmpty()) { + HeapChart.getInstance().parseLogPackage(pack); + } + + Logs recorderLogs = pack + .getLogs(DataChannelConstants.MSG_PROBE_UIEVENT); + if (recorderLogs != null && !recorderLogs.getRawLogs().isEmpty()) { + UIEventChart.getInstance().parseLogPackage(pack); + } + + Logs customLogs = pack + .getLogs(DataChannelConstants.MSG_PROBE_CUSTOM); + if (customLogs != null && !customLogs.getRawLogs().isEmpty()) { + customLogParser.parseLogPackage(pack); + } + + Logs lifecycleLogs = pack + .getLogs(DataChannelConstants.MSG_PROBE_LIFECYCLE); + if (lifecycleLogs != null && !lifecycleLogs.getRawLogs().isEmpty()) { + lifecycleLogParser.parseLogPackage(pack); + } + + Logs screenShotLogs = pack + .getLogs(DataChannelConstants.MSG_PROBE_SCREENSHOT); + if (screenShotLogs != null + && !screenShotLogs.getRawLogs().isEmpty()) { + ScreenshotChart.getInstance().parseLogPackage(pack); + } + } + + /* log for debug */ + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java index 197e950..d66670a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java @@ -36,39 +36,30 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.ScrollBar; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseEventListener; import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; +import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.timeline.chart.HeapChart; -import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; -import org.tizen.dynamicanalyzer.ui.timeline.chart.UIEventChart; -import org.tizen.dynamicanalyzer.ui.timeline.logparser.CustomLogParser; -import org.tizen.dynamicanalyzer.ui.timeline.logparser.DeviceLogParser; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; -public class TimelineView extends DAView { - public static final String ID = TimelineView.class.getName(); - +public class TimelineView extends DAViewComposite { private final DAChartBoard chartBoard; private final TimelineChartManager timelineChartManager = TimelineChartManager @@ -76,18 +67,14 @@ public class TimelineView extends DAView { private final RangeDataManager rangeDataManager = RangeDataManager .getInstance(); - private final DeviceLogParser deviceLogParser = new DeviceLogParser(); - private final CustomLogParser customLogParser = new CustomLogParser(); private final LifecycleLogParser lifecycleLogParser = LifecycleLogParser .getInstance(); public TimelineView(Composite parent, int style) { - super(parent, style); + super(parent, style, false); setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, false); - - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); chartBoard = new DAChartBoard(contents, "Timeline"); //$NON-NLS-1$ @@ -100,10 +87,11 @@ public class TimelineView extends DAView { @Override public void widgetSelected(SelectionEvent e) { DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil - .getView(TimelinePage.ID, DATabComposite.ID); - SnapshotView snapshotView = (SnapshotView) timelineTabComp - .getTab(SnapshotView.ID); - snapshotView.setLatestButtonEnable(true); + .getView(TimelinePage.pageID, + ScreenshotTabComposite.tabID); + ScreenshotView screenshotView = (ScreenshotView) timelineTabComp + .getView(ScreenshotTabComposite.screenshotViewID); + screenshotView.setLatestButtonEnable(true); } @Override @@ -147,21 +135,25 @@ public class TimelineView extends DAView { } @Override - public void updateView(DASelectionData selData) { - long start = selData.getStartTime(); - long end = selData.getEndTime(); - - Double startTime = start / TimelineConstants.MEGA_DOUBLE; - Double endTime = end / TimelineConstants.MEGA_DOUBLE; - double middleTime = (startTime + endTime) / 2.0; - if (startTime.equals(endTime)) { - middleTime = startTime; - } + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + long start = selData.getStartTime(); + long end = selData.getEndTime(); + + Double startTime = start / TimelineConstants.MEGA_DOUBLE; + Double endTime = end / TimelineConstants.MEGA_DOUBLE; + double middleTime = (startTime + endTime) / 2.0; + if (startTime.equals(endTime)) { + middleTime = startTime; + } - chartBoard.setVisibleMiddleTime(middleTime); - DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard - .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(startTime, endTime); + chartBoard.setVisibleMiddleTime(middleTime); + DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard + .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); + intervalMarker.setInterval(startTime, endTime); + } } @Override @@ -172,15 +164,16 @@ public class TimelineView extends DAView { } DATabComposite timelineTabComp = (DATabComposite) AnalyzerUtil.getView( - TimelinePage.ID, DATabComposite.ID); - SnapshotView snapshotView = (SnapshotView) timelineTabComp - .getTab(SnapshotView.ID); + TimelinePage.pageID, ScreenshotTabComposite.tabID); + ScreenshotView screenshotView = (ScreenshotView) timelineTabComp + .getView(ScreenshotTabComposite.screenshotViewID); + long time = ToolbarArea.getInstance().getTime(); - if (snapshotView != null && !snapshotView.isLatestButtonEnabled()) { + if (screenshotView != null && !screenshotView.isLatestButtonEnabled()) { DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) chartBoard .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); - intervalMarker.setInterval(time / TimelineConstants.MEGA_DOUBLE, time - / TimelineConstants.MEGA_DOUBLE); + intervalMarker.setInterval(time / TimelineConstants.MEGA_DOUBLE, + time / TimelineConstants.MEGA_DOUBLE); } chartBoard.setTimelineMarkerStartTime(rangeDataManager @@ -207,59 +200,16 @@ public class TimelineView extends DAView { / TimelineConstants.MEGA_DOUBLE, rangeDataManager.getMarkerEndTime() / TimelineConstants.MEGA_DOUBLE); - + timelineChartManager.addNewCustomChart(); chartBoard.setTotalEndTime(time); } @Override - public void updateLog(LogPackage logPack) { - if (null == logPack) { - return; - } - - Logs deviceLogs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); - if (deviceLogs != null && !deviceLogs.getRawLogs().isEmpty()) { - deviceLogParser.parseLogPackage(logPack); - } - - Logs memoryLogs = logPack - .getLogs(DataChannelConstants.MSG_PROBE_MEMORY); - if (memoryLogs != null && !memoryLogs.getRawLogs().isEmpty()) { - HeapChart.getInstance().parseLogPackage(logPack); - } - - Logs recorderLogs = logPack - .getLogs(DataChannelConstants.MSG_PROBE_UIEVENT); - if (recorderLogs != null && !recorderLogs.getRawLogs().isEmpty()) { - UIEventChart.getInstance().parseLogPackage(logPack); - } - - Logs customLogs = logPack - .getLogs(DataChannelConstants.MSG_PROBE_CUSTOM); - if (customLogs != null && !customLogs.getRawLogs().isEmpty()) { - customLogParser.parseLogPackage(logPack); - } - - Logs lifecycleLogs = logPack - .getLogs(DataChannelConstants.MSG_PROBE_LIFECYCLE); - if (lifecycleLogs != null && !lifecycleLogs.getRawLogs().isEmpty()) { - lifecycleLogParser.parseLogPackage(logPack); - } - - Logs screenShotLogs = logPack - .getLogs(DataChannelConstants.MSG_PROBE_SCREENSHOT); - if (screenShotLogs != null && !screenShotLogs.getRawLogs().isEmpty()) { - ScreenshotChart.getInstance().parseLogPackage(logPack); - } - } - - @Override public void clear() { chartBoard.contentsClear(); chartBoard.clear(); timelineChartManager.clear(); - customLogParser.clear(); // SnapshotData.getInstance().clear(); initializeCharts(); } @@ -323,4 +273,14 @@ public class TimelineView extends DAView { rangeMarker.setAlpha((int) (255 * 0.25)); board.addIntervalMarker(rangeMarker); } + + public void setRangeMarker(double starttime, double endtime) { + chartBoard.setTimelineMarkerStartTime(starttime); + chartBoard.setTimelineMarkerEndTime(endtime); + + ((DAChartPlotIntervalMarker) chartBoard.getMarkers().get( + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + starttime, endtime); + } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java index 431a329..279c567 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java @@ -62,9 +62,12 @@ public class CustomLogParser { private static final int CUSTOM_COLOR_MAGNETA = 9; private static final int CUSTOM_COLOR_TEAL = 10; - private TimelineChartManager chartManager = TimelineChartManager - .getInstance(); + private TimelineChartManager chartManager = null; private Map customChartSeriesMap = new HashMap(); + + public CustomLogParser(TimelineChartManager parent) { + chartManager = parent; + } public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_CUSTOM); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java index c6b60b3..017c7a4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java @@ -10,10 +10,13 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; public class DeviceLogParser { - private TimelineChartManager timelineChartManager = TimelineChartManager - .getInstance(); + private TimelineChartManager timelineChartManager = null; private GLFrameRateChart frameRateChart = GLFrameRateChart.getInstance(); + public DeviceLogParser(TimelineChartManager parent) { + timelineChartManager = parent; + } + public void parseLogPackage(LogPackage logPack) { Logs deviceLogs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); if (deviceLogs != null && deviceLogs.getRawLogs() != null diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/uievent/UIEventListDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/uievent/UIEventListDialog.java index 6bab074..cad611c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/uievent/UIEventListDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/uievent/UIEventListDialog.java @@ -22,8 +22,8 @@ import org.tizen.dynamicanalyzer.nl.TimelinePageLabels; import org.tizen.dynamicanalyzer.nl.WidgetLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; @@ -32,10 +32,8 @@ import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; -import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; -import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; public class UIEventListDialog extends Dialog { @@ -168,8 +166,8 @@ public class UIEventListDialog extends Dialog { @Override public void handleClickEvent(DACustomButton button) { RangeDataManager rangeDataManager = RangeDataManager.getInstance(); - DAChartBoard chartBoard = (DAChartBoard) AnalyzerManager - .getCurrentPage().getView(TimelineView.ID).getControl(); + TimelineView tview = (TimelineView) AnalyzerManager + .getCurrentPage().getView(TimelinePage.timelineViewID); Double startTime = (Double) uiEventListTable.getTable().getData( KEY_START_TIME); @@ -191,14 +189,8 @@ public class UIEventListDialog extends Dialog { .setMarkerStartTime((long) (startTime * TimelineConstants.MEGA_DOUBLE)); double revisedEndTime = rangeDataManager.getMarkerEndTime(); - chartBoard.setTimelineMarkerStartTime(startTime); - chartBoard.setTimelineMarkerEndTime(revisedEndTime + tview.setRangeMarker(startTime, revisedEndTime / TimelineConstants.MEGA_DOUBLE); - - ((DAChartPlotIntervalMarker) chartBoard.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - startTime, revisedEndTime - / TimelineConstants.MEGA_DOUBLE); } if (endTime != -1) { @@ -207,14 +199,8 @@ public class UIEventListDialog extends Dialog { double revisedStartTime = rangeDataManager.getMarkerStartTime(); - chartBoard.setTimelineMarkerStartTime(revisedStartTime - / TimelineConstants.MEGA_DOUBLE); - chartBoard.setTimelineMarkerEndTime(endTime); - - ((DAChartPlotIntervalMarker) chartBoard.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval( - revisedStartTime / TimelineConstants.MEGA_DOUBLE, - endTime); + tview.setRangeMarker(revisedStartTime + / TimelineConstants.MEGA_DOUBLE, endTime); } shell.dispose(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index 31d9fcb..5360fc4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -287,11 +287,11 @@ public class ConfigureManager { } if (null == data.get(ConfigureLabels.SNAPSHOT_PERIODIC)) { data.put(ConfigureLabels.SNAPSHOT_PERIODIC, - Long.toString(AnalyzerConstants.SNAPSHOT_PERIODIC)); + Long.toString(AnalyzerConstants.SCREENSHOT_PERIODIC)); } if (null == data.get(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO)) { data.put(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO, - Long.toString(AnalyzerConstants.SNAPSHOT_PERIODIC_AUTO)); + Long.toString(AnalyzerConstants.SCREENSHOT_PERIODIC_AUTO)); } if (null == data .get(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC)) { 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 d6ef7d5..e793a9e 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 @@ -35,12 +35,7 @@ import org.tizen.dynamicanalyzer.logparser.LogParser; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.swap.logparser.SWAPLogParser; -import org.tizen.dynamicanalyzer.ui.file.FileChartManager; -import org.tizen.dynamicanalyzer.ui.network.NetworkChartManager; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; -import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; -import org.tizen.dynamicanalyzer.ui.thread.ThreadChartManager; -import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; public class StopLogProcessor implements Runnable { @@ -92,25 +87,7 @@ public class StopLogProcessor implements Runnable { } else { LogParser.stopLogParser(); } - percent += 5; - StopProcessManager.getInstance().setValue(percent); - - FileChartManager.getInstance().stopUpdateLogThread(); - percent += 5; - StopProcessManager.getInstance().setValue(percent); - - NetworkChartManager.getInstance().stopUpdateLogThread(); - percent += 5; - StopProcessManager.getInstance().setValue(percent); - - ThreadChartManager.getInstance().stopUpdateLogThread(); - - FunctionUsageProfiler.stopProfiler(); - percent += 5; - StopProcessManager.getInstance().setValue(percent); - - UIDataManager.getInstance().stopUpdateLogThread(); - percent += 5; + percent += 30; StopProcessManager.getInstance().setValue(percent); UpdateViewTimer.stop(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java index 9fbfe80..ccace10 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopProcessManager.java @@ -81,7 +81,7 @@ public class StopProcessManager { public void stopTrace() { if (null != dialog) { dialog.setValue(100); - AnalyzerUtil.changePage(SummaryPage.ID); + AnalyzerUtil.changePage(SummaryPage.pageID); dialog.close(); state = STOP_PROCESS_END; } 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 f08978c..b3e9ed2 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 @@ -305,7 +305,7 @@ public class ToolbarArea { public void selectionEvent(DACustomCombo combo) { BaseView baseView = (BaseView) WorkbenchUtil .getViewPart(BaseView.ID); - baseView.getTopComposite().updatePage(); + baseView.getTopComposite().updateView(); } }); @@ -494,7 +494,7 @@ public class ToolbarArea { } }); - AnalyzerUtil.changePage(TimelinePage.ID); + AnalyzerUtil.changePage(TimelinePage.pageID); AnalyzerManager.setRunningState(true); processCombo.initCombo(); processCombo.add(ALL_PROCESS); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/UpdateTimerTask.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/UpdateTimerTask.java index 1f7654b..beec4c5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/UpdateTimerTask.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/UpdateTimerTask.java @@ -30,7 +30,7 @@ import java.util.TimerTask; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class UpdateTimerTask extends TimerTask { @@ -42,7 +42,7 @@ public class UpdateTimerTask extends TimerTask { @Override public void run() { DAPageComposite page = AnalyzerManager.getCurrentPage(); - page.updatePage(); + page.updateView(); } }); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java index 15ab6cb..a5716b8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java @@ -61,13 +61,13 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.LoadSettingDialog; import org.tizen.dynamicanalyzer.swap.platform.ui.SaveSettingDialog; import org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer.DeviceExplorerDilaog; import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.FileExplorerDialog; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.WarningDialog; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class BinarySettingsPage extends DAPageComposite { public static final String ID = BinarySettingsPage.class.getName(); @@ -238,8 +238,9 @@ public class BinarySettingsPage extends DAPageComposite { public BinarySettingsPage(Composite parent, int style) { super(parent, style); me = this; - name = "Binary Settings"; // TODO nl - rootPath = PathManager.getRootstrapsPath(ConfigureManager.getPlatform()); + setTitle("Binary Settings"); // TODO nl + rootPath = PathManager + .getRootstrapsPath(ConfigureManager.getPlatform()); inputRowHash = BinarySettingManager.getInstance().getInputRowHash(); inputRowList = BinarySettingManager.getInstance().getInputRowList(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java index 19b3941..1e57f24 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java @@ -46,12 +46,13 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; +import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class ConfigurationDialog extends DAMessageBox { private static boolean opened = false; @@ -109,13 +110,12 @@ public class ConfigurationDialog extends DAMessageBox { Composite selectedComposite = tabView.getTopComposite(); if (!(selectedComposite instanceof BinarySettingsPage)) { ConfigurationDialogDataManager.getInstance() - .updateFeaturesValueFromConfigureManager(); + .updateFeaturesValueFromConfigureManager(); } else { BinarySettingsPage page = (BinarySettingsPage) selectedComposite; page.doClose(); } - } public void enableButteon() { @@ -191,11 +191,11 @@ public class ConfigurationDialog extends DAMessageBox { featuresTable = featuresPage.getFeatureTable(); ConfigurationDialogDataManager.getInstance().setConfigDlg(this); - Composite settingPage = new ConfigurationDialogSettingPage( + DABaseComposite settingPage = new ConfigurationDialogSettingPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(settingPage, false); - Composite binarySettings = new BinarySettingsPage( + DABaseComposite binarySettings = new BinarySettingsPage( tabView.getContentComposite(), SWT.NONE); tabView.addView(binarySettings, false); // button diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java index 856b92f..a52bac4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java @@ -304,10 +304,10 @@ public class ConfigurationDialogDataManager { .equals(ConfigureLabels.INCLUDE_INSIDE_OPENGL)) { value = AnalyzerConstants.OPENGL_API_PROBING_NO_FILTER; } else if (featureName.equals(ConfigureLabels.SNAPSHOT_PERIODIC)) { - value = AnalyzerConstants.SNAPSHOT_PERIODIC; + value = AnalyzerConstants.SCREENSHOT_PERIODIC; } else if (featureName .equals(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO)) { - value = AnalyzerConstants.SNAPSHOT_PERIODIC_AUTO; + value = AnalyzerConstants.SCREENSHOT_PERIODIC_AUTO; } else if (featureName .equals(ConfigureLabels.FUNCTION_PROFILING_SAMPLING_PERIODIC)) { value = AnalyzerConstants.FUNCTION_PROFILING_SAMPLING_PERIODIC; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java index 14cd8b9..6d25306 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java @@ -49,11 +49,11 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckBox; import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckboxSelectionListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAText; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class ConfigurationDialogFeaturesPage extends DAPageComposite { public static final String ITEM_PARENT_FEATURE_NAME_ITEM = ", parent_feature_name_";//$NON-NLS-1$ @@ -79,7 +79,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { public ConfigurationDialogFeaturesPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_CONFIGURATION_FEATURES; + setTitle(AnalyzerLabels.COOLBAR_AREA_CONFIGURATION_FEATURES); this.setLayout(new FormLayout()); this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); @@ -195,12 +195,12 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { @Override public void widgetSelected(SelectionEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub + // do nothing } }; @@ -208,12 +208,11 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { @Override public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void mouseDown(MouseEvent e) { - // TODO Auto-generated method stub updateDetails(); ConfigurationDialogDataManager.getInstance() .updateSaveButtonStatus(null); @@ -221,7 +220,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { @Override public void mouseDoubleClick(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java index 4ef2886..440f623 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogSettingPage.java @@ -36,9 +36,9 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckBox; import org.tizen.dynamicanalyzer.widgets.button.checkbox.DACheckboxSelectionListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class ConfigurationDialogSettingPage extends DAPageComposite { public static final String ID = ConfigurationDialogSettingPage.class @@ -50,7 +50,7 @@ public class ConfigurationDialogSettingPage extends DAPageComposite { public ConfigurationDialogSettingPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_CONFIGURATION_SETTING; + setTitle(AnalyzerLabels.COOLBAR_AREA_CONFIGURATION_SETTING); this.setLayout(new FormLayout()); this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); @@ -126,14 +126,14 @@ public class ConfigurationDialogSettingPage extends DAPageComposite { private DACheckboxSelectionListener showInitiaRadioButtonListener = new DACheckboxSelectionListener() { @Override public void handleSelectionEvent(DACheckBox checkbox) { - if (ConfigurationDialogDataManager.getInstance() - .getfeatureValue(ConfigureLabels.SHOW_INITIAL) > 0) { - ConfigurationDialogDataManager.getInstance() - .setfeatureValue(ConfigureLabels.SHOW_INITIAL, 0); + if (ConfigurationDialogDataManager.getInstance().getfeatureValue( + ConfigureLabels.SHOW_INITIAL) > 0) { + ConfigurationDialogDataManager.getInstance().setfeatureValue( + ConfigureLabels.SHOW_INITIAL, 0); showInitialCheckBox.setChecked(false); } else { - ConfigurationDialogDataManager.getInstance() - .setfeatureValue(ConfigureLabels.SHOW_INITIAL, 1); + ConfigurationDialogDataManager.getInstance().setfeatureValue( + ConfigureLabels.SHOW_INITIAL, 1); showInitialCheckBox.setChecked(true); } ConfigurationDialogDataManager.getInstance() @@ -144,14 +144,14 @@ public class ConfigurationDialogSettingPage extends DAPageComposite { private DACheckboxSelectionListener autoStopRadioButtonListener = new DACheckboxSelectionListener() { @Override public void handleSelectionEvent(DACheckBox checkbox) { - if (ConfigurationDialogDataManager.getInstance() - .getfeatureValue(ConfigureLabels.AUTO_STOP) > 0) { - ConfigurationDialogDataManager.getInstance() - .setfeatureValue(ConfigureLabels.AUTO_STOP, 0); + if (ConfigurationDialogDataManager.getInstance().getfeatureValue( + ConfigureLabels.AUTO_STOP) > 0) { + ConfigurationDialogDataManager.getInstance().setfeatureValue( + ConfigureLabels.AUTO_STOP, 0); autoStopCheckBox.setChecked(false); } else { - ConfigurationDialogDataManager.getInstance() - .setfeatureValue(ConfigureLabels.AUTO_STOP, 1); + ConfigurationDialogDataManager.getInstance().setfeatureValue( + ConfigureLabels.AUTO_STOP, 1); autoStopCheckBox.setChecked(true); } ConfigurationDialogDataManager.getInstance() 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 17dff0d..6b9bb58 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 @@ -33,12 +33,11 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; 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.ui.page.BaseView; -import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class OpenTraceInputReader implements Runnable { @@ -178,8 +177,7 @@ public class OpenTraceInputReader implements Runnable { if (null == logPack || logPack.isEmpty()) { return; } - - BaseView bv = (BaseView) WorkbenchUtil.getViewPart(BaseView.ID); - bv.getMainTab().updateLog(logPack); + + DataManagerRegistry.updateLog(logPack); } } 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 2bf7dfe..e5f0724 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 @@ -34,11 +34,8 @@ import org.tizen.dynamicanalyzer.handlers.OpenTraceCompleteHandler; import org.tizen.dynamicanalyzer.handlers.OpenTraceHandler; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.project.Project; -import org.tizen.dynamicanalyzer.ui.file.FileChartManager; -import org.tizen.dynamicanalyzer.ui.network.NetworkChartManager; -import org.tizen.dynamicanalyzer.ui.thread.ThreadChartManager; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; -import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.da.base.ProgressDialog; @@ -135,7 +132,7 @@ public class OpenTraceProgressManager implements Runnable { Display.getDefault().syncExec(new Runnable() { @Override public void run() { - AnalyzerUtil.changePage(TimelinePage.ID); + AnalyzerUtil.changePage(TimelinePage.pageID); dialog.setValue(100); dialog.close(); @@ -186,21 +183,15 @@ public class OpenTraceProgressManager implements Runnable { public void runThreads() { OpenTraceInputReader.startOpenTraceInputReader(); - FileChartManager.getInstance().startUpdateLogThread(); - NetworkChartManager.getInstance().startUpdateLogThread(); - ThreadChartManager.getInstance().startUpdateLogThread(); - UIDataManager.getInstance().startUpdateLogThread(); + DataManagerRegistry.startThreads(); } private void waitingThreads() { while (!AnalyzerManager.isExit()) { OpenTraceInputReader.stopOpenTraceInputReader(); - FileChartManager.getInstance().stopUpdateLogThread(); - NetworkChartManager.getInstance().stopUpdateLogThread(); - ThreadChartManager.getInstance().stopUpdateLogThread(); - UIDataManager.getInstance().stopUpdateLogThread(); + DataManagerRegistry.stopThreads(); try { - if (!UIDataManager.getInstance().isThreadAlive()) { + if (DataManagerRegistry.isAnyoneAlive()) { break; } else { Thread.sleep(AnalyzerConstants.LOG_CHECK_INTERVAL); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotDialog.java similarity index 81% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotDialog.java index 9785927..bba9cbb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotDialog.java @@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.SnapshotConstants; +import org.tizen.dynamicanalyzer.common.ScreenshotConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.constant.CommonConstants; @@ -62,15 +62,15 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -public class ReplayEditSnapshotDialog extends DAMessageBox { - private DATableComposite snapShotTable = null; +public class ReplayEditScreenshotDialog extends DAMessageBox { + private DATableComposite screenshotTable = null; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_GRID, AnalyzerConstants.SORT_TYPE_GRID, AnalyzerConstants.SORT_TYPE_GRID }; int[] sourceColumns = { 0, 0, 0 }; private String[] columnNames = { CommonConstants.EMPTY, CommonConstants.EMPTY, CommonConstants.EMPTY }; - private int[] columnSizes = { SnapshotConstants.DEFAULT_IMAGE_WIDTH + 15, + private int[] columnSizes = { ScreenshotConstants.DEFAULT_IMAGE_WIDTH + 15, 0, 0 }; private boolean[] columnVisibility = { true, true, true }; @@ -79,14 +79,14 @@ public class ReplayEditSnapshotDialog extends DAMessageBox { private String resolutionWidth = CommonConstants.EMPTY; private String resolutionHeight = CommonConstants.EMPTY; - public ReplayEditSnapshotDialog(Shell parent, GridItem item) { + public ReplayEditScreenshotDialog(Shell parent, GridItem item) { super(parent); this.item = item; } protected boolean run() { - shell.setSize(SnapshotConstants.DEFAULT_IMAGE_WIDTH + 15, - SnapshotConstants.DEFAULT_IMAGE_HEIGHT + 42); + shell.setSize(ScreenshotConstants.DEFAULT_IMAGE_WIDTH + 15, + ScreenshotConstants.DEFAULT_IMAGE_HEIGHT + 42); shell.setLayout(new FormLayout()); shell.setText(ReplayEditLabels.REPLAY_EDIT_SNAPSHOT_TABLE_TITLE); @@ -101,31 +101,31 @@ public class ReplayEditSnapshotDialog extends DAMessageBox { tableComp.setLayoutData(data); tableComp.setBackground(ColorResources.DIALOG_BG_UPPER); - snapShotTable = new ReplayEditSnapshotTable(tableComp, SWT.NONE + screenshotTable = new ReplayEditScreenshotTable(tableComp, SWT.NONE | SWT.V_SCROLL | SWT.SINGLE, getSavedPouchPoint(item.getText(4)), getSavedPouchPoint(item.getText(5))); - snapShotTable.setTableName(ReplayEditLabels.TABLE_TITLE); - snapShotTable.setComparator(new DefaultTableComparator()); - snapShotTable.setSortTypes(sortTypes); - snapShotTable.setColumns(columnNames); - snapShotTable.setColumnSize(columnSizes); - snapShotTable.setColumnVisibility(columnVisibility); - snapShotTable.setTableToolTipEnable(false); - snapShotTable.getTable().addSelectionListener( + screenshotTable.setTableName(ReplayEditLabels.TABLE_TITLE); + screenshotTable.setComparator(new DefaultTableComparator()); + screenshotTable.setSortTypes(sortTypes); + screenshotTable.setColumns(columnNames); + screenshotTable.setColumnSize(columnSizes); + screenshotTable.setColumnVisibility(columnVisibility); + screenshotTable.setTableToolTipEnable(false); + screenshotTable.getTable().addSelectionListener( featureTableSelectionListener); - snapShotTable.getTable().addMouseListener(mouseListener); - snapShotTable.getTable().setHeaderVisible(false); + screenshotTable.getTable().addMouseListener(mouseListener); + screenshotTable.getTable().setHeaderVisible(false); data = new FormData(); data.top = new FormAttachment(0, 0); data.left = new FormAttachment(0, 0); data.right = new FormAttachment(100, 0); data.bottom = new FormAttachment(100, 0); - snapShotTable.setLayoutData(data); - snapShotTable.getTable().setItemHeight( - SnapshotConstants.DEFAULT_IMAGE_HEIGHT); + screenshotTable.setLayoutData(data); + screenshotTable.getTable().setItemHeight( + ScreenshotConstants.DEFAULT_IMAGE_HEIGHT); - snapShotTable.updateTable(); + screenshotTable.updateTable(); return true; } @@ -151,12 +151,12 @@ public class ReplayEditSnapshotDialog extends DAMessageBox { @Override public void mouseDown(MouseEvent e) { Point DisplyPt = Display.getCurrent().getCursorLocation(); - int tableX = snapShotTable.getTable().getShell().getBounds().x; - int tableY = snapShotTable.getTable().getShell().getBounds().y; + int tableX = screenshotTable.getTable().getShell().getBounds().x; + int tableY = screenshotTable.getTable().getShell().getBounds().y; int imgClickX = DisplyPt.x - tableX - 5; int imgClickY = DisplyPt.y - tableY - 55; - int drawImagWidth = SnapshotConstants.DEFAULT_IMAGE_WIDTH; - int drawImagHeight = SnapshotConstants.DEFAULT_IMAGE_HEIGHT - 20; + int drawImagWidth = ScreenshotConstants.DEFAULT_IMAGE_WIDTH; + int drawImagHeight = ScreenshotConstants.DEFAULT_IMAGE_HEIGHT - 20; int imgWidth = 720; int imgHeight = 1280; @@ -192,12 +192,12 @@ public class ReplayEditSnapshotDialog extends DAMessageBox { if (value.contains(ReplayEditLabels.CONTEXT_VALUE_X)) { point = Integer.parseInt(value.replace( ReplayEditLabels.CONTEXT_VALUE_X, "")); - point = (point * SnapshotConstants.DEFAULT_IMAGE_WIDTH) / Integer.parseInt(resolutionWidth); + point = (point * ScreenshotConstants.DEFAULT_IMAGE_WIDTH) / Integer.parseInt(resolutionWidth); } if (value.contains(ReplayEditLabels.CONTEXT_VALUE_Y)) { point = Integer.parseInt(value.replace( ReplayEditLabels.CONTEXT_VALUE_Y, "")); - point = (point * SnapshotConstants.DEFAULT_IMAGE_HEIGHT) / Integer.parseInt(resolutionHeight); + point = (point * ScreenshotConstants.DEFAULT_IMAGE_HEIGHT) / Integer.parseInt(resolutionHeight); } return point; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java similarity index 95% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotTable.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java index dbaf6e5..dd1e03c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapshotTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditScreenshotTable.java @@ -41,7 +41,7 @@ import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; -public class ReplayEditSnapshotTable extends DATableComposite { +public class ReplayEditScreenshotTable extends DATableComposite { private int savedX = 0; private int savedY = 0; @@ -93,7 +93,7 @@ public class ReplayEditSnapshotTable extends DATableComposite { table.update(); } - public ReplayEditSnapshotTable(Composite parent, int style, int x, int y) { + public ReplayEditScreenshotTable(Composite parent, int style, int x, int y) { super(parent, style); savedX = x; savedY = y; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java index 1774346..104a276 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java @@ -37,7 +37,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; -import org.tizen.dynamicanalyzer.common.SnapshotConstants; +import org.tizen.dynamicanalyzer.common.ScreenshotConstants; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; @@ -112,8 +112,8 @@ public class ReplayEditSnapShopTableCellRenderer extends DefaultCellRenderer { } Rectangle bounds = img.getBounds(); - int width = SnapshotConstants.DEFAULT_IMAGE_WIDTH; - int height = SnapshotConstants.DEFAULT_IMAGE_HEIGHT; + int width = ScreenshotConstants.DEFAULT_IMAGE_WIDTH; + int height = ScreenshotConstants.DEFAULT_IMAGE_HEIGHT; gc.drawImage(img, 0, 0, bounds.width, bounds.height, 0, 0, width, height); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java index 703f46e..1b24cce 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java @@ -1030,7 +1030,7 @@ public class ReplayEditTable extends DATableComposite { MousePt.x, MousePt.y); } else if (selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_X) || selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_Y)) { - ReplayEditSnapshotDialog dialog = new ReplayEditSnapshotDialog( + ReplayEditScreenshotDialog dialog = new ReplayEditScreenshotDialog( table.getShell(), item); dialog.open(); return false; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableView.java index 052462a..488fee2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableView.java @@ -38,9 +38,9 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.ReplayEditLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class ReplayEditTableView extends DAPageComposite { public static final String ID = ReplayEditTableView.class.getName(); @@ -61,7 +61,7 @@ public class ReplayEditTableView extends DAPageComposite { public ReplayEditTableView(Composite parent, int style) { super(parent, style); - name = ReplayEditLabels.TABLE_PAGE_TITLE; + setTitle(ReplayEditLabels.TABLE_PAGE_TITLE); this.setLayout(new FormLayout()); this.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); FormData data = new FormData(); @@ -77,8 +77,8 @@ public class ReplayEditTableView extends DAPageComposite { tableComp.setBackground(ColorResources.DIALOG_BG_UPPER); // Table - replayTable = new ReplayEditTable(tableComp, SWT.BORDER - | SWT.V_SCROLL | SWT.SINGLE); + replayTable = new ReplayEditTable(tableComp, SWT.BORDER | SWT.V_SCROLL + | SWT.SINGLE); replayTable.setTableName(ReplayEditLabels.TABLE_TITLE); replayTable.setComparator(new DefaultTableComparator()); replayTable.setSortTypes(sortTypes); @@ -107,7 +107,7 @@ public class ReplayEditTableView extends DAPageComposite { @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub + // do nothing } }; @@ -115,20 +115,20 @@ public class ReplayEditTableView extends DAPageComposite { @Override public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void mouseDown(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void mouseDoubleClick(MouseEvent e) { } }; - - public DATableComposite getReplayTable(){ + + public DATableComposite getReplayTable() { return this.replayTable; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java index e013ae2..e59e1c0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java @@ -29,13 +29,12 @@ package org.tizen.dynamicanalyzer.ui.userinterface; import java.util.HashMap; import java.util.List; -import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.logparser.LogListQueue; import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; +import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.ControlData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.SceneData; @@ -43,18 +42,16 @@ import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListDataCheck import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingDataChecker; import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneDataChecker; -public class UIDataManager implements Runnable { +public class UIDataManager extends PageDataManager { private static UIDataManager instance = null; private static UIControlListDataChecker controlListDataChecker = null; private static UISceneDataChecker sceneTransformDataChecker = null; private static UIFunctionProfilingDataChecker functionProfilingDataChecker = null; - private HashMap findSnapshotViewHashMap = new HashMap(); + private HashMap findScreenshotViewHashMap = new HashMap(); - private Thread updateLogThread = null; private String strTableSeleteClassName = null; - private LogListQueue logListQueue = null; public synchronized static UIDataManager getInstance() { if (null == instance) { @@ -66,89 +63,38 @@ public class UIDataManager implements Runnable { private UIDataManager() { } - public void startUpdateLogThread() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - updateLogThread = new Thread(null, new UIDataManager(), - AnalyzerConstants.USER_INTERFACE_PAGE_MANAGER_THREAD); - updateLogThread.start(); - } - } - - public void stopUpdateLogThread() { - if (null != updateLogThread && updateLogThread.isAlive()) { - try { - sendNotify(); - updateLogThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("ui data manager joined!"); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - public boolean isThreadAlive() { - if (null == updateLogThread || !updateLogThread.isAlive()) { - return false; - } - return true; - } - - public LogListQueue getLogListQueue() { - if (null == logListQueue) { - logListQueue = new LogListQueue(); - } - return logListQueue; - } - @Override public void run() { - LogListQueue logListQueue = getInstance().getLogListQueue(); while (!AnalyzerManager.isExit()) { - List logs = logListQueue.getFirst(); - if (null == logs) { + LogPackage pack = pollPack(); + if (pack == null) // stop thread break; + + Logs logs = pack.getLogs(DataChannelConstants.MSG_PROBE_UICONTROL); + if (null != logs && logs.getRawLogs() != null + && logs.getRawLogs().size() != 0) { + List inputs = logs.getLogs(); + int size = inputs.size(); + for (int i = 0; i < size; i++) { + getControlDataChecker().parserLog( + (ControlData) inputs.get(i)); + } } - int size = logs.size(); - for (int i = 0; i < size; i++) { - int nLogType = logs.get(i).getId(); - if (nLogType == DataChannelConstants.MSG_PROBE_UICONTROL) { - getInstance().getControlDataChecker().parserLog( - (ControlData) logs.get(i)); - } else { - getInstance().getSceneTransformDataChecker().parserLog( - (SceneData) logs.get(i)); + + logs = pack.getLogs(DataChannelConstants.MSG_PROBE_SCENE); + if (null != logs && logs.getRawLogs() != null + && logs.getRawLogs().size() != 0) { + List inputs = logs.getLogs(); + int size = inputs.size(); + for (int i = 0; i < size; i++) { + getSceneTransformDataChecker().parserLog( + (SceneData) inputs.get(i)); } } } + /* log for debug */ - System.out.println("ui data manager thread end!!"); //$NON-NLS-1$ - } - - public void parsePageData(LogPackage logPack) { - setSceneTransformDataTFromLogPackage(logPack); - setControlDataTFromLogPackage(logPack); - UIDataManager.getInstance().getfunctionProfilingDataChecker() - .updateUIApiTreeSet(); - } - - public void setControlDataTFromLogPackage(LogPackage logPack) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_UICONTROL); - if (null == logs || logs.getRawLogs() == null - || logs.getRawLogs().size() == 0) { - return; - } - List inputs = logs.getLogs(); - getLogListQueue().putLog(inputs); - } - - public void setSceneTransformDataTFromLogPackage(LogPackage logPack) { - Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_SCENE); - if (null == logs || logs.getRawLogs() == null - || logs.getRawLogs().size() == 0) { - return; - } - List inputs = logs.getLogs(); - getLogListQueue().putLog(inputs); + System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { @@ -156,7 +102,7 @@ public class UIDataManager implements Runnable { sceneTransformDataChecker = null; functionProfilingDataChecker = null; strTableSeleteClassName = null; - findSnapshotViewHashMap.clear(); + findScreenshotViewHashMap.clear(); } public UIControlListDataChecker getControlDataChecker() { @@ -191,14 +137,7 @@ public class UIDataManager implements Runnable { return strTableSeleteClassName; } - public static void sendNotify() { - LogListQueue logListQueue = getInstance().getLogListQueue(); - synchronized (logListQueue) { - logListQueue.notifyAll(); - } - } - - public HashMap getFindSnapshotViewHashMap() { - return findSnapshotViewHashMap; + public HashMap getFindScreenshotViewHashMap() { + return findScreenshotViewHashMap; } } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java index d6d7da9..bf927c9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java @@ -33,24 +33,31 @@ import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; -import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SnapshotView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; +import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; +import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView; import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView; import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneListView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class UIPage extends DAPageComposite { + public static final String pageID = UIPage.class.getName(); + public static final String controlListViewID = UIControlListView.class + .getName(); + public static final String sceneListViewID = UISceneListView.class + .getName(); + public static final String profilingViewID = UIFunctionProfilingView.class + .getName(); + SashForm baseForm; SashForm upperForm; SashForm bottomForm; - public static final String ID = UIPage.class.getName(); public UIPage(Composite parent, int style) { super(parent, style); - name = AnalyzerLabels.COOLBAR_AREA_UI; - this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_UI_TOOLTIP); + setTitle(AnalyzerLabels.COOLBAR_AREA_UI); + this.setData(DAPageComposite.KEY_TOOLTIP, + ShortCutManager.COOLBAR_AREA_UI_TOOLTIP); this.setLayout(new FillLayout()); baseForm = new SashForm(this, SWT.VERTICAL); baseForm.setLayout(new FillLayout()); @@ -65,20 +72,15 @@ public class UIPage extends DAPageComposite { SWT.NONE); addView(topLeftSencond); - DATabComposite tabView = new DATabComposite(upperForm, SWT.NONE); + ScreenshotTabComposite tabView = new ScreenshotTabComposite(upperForm, + SWT.NONE, UIPage.pageID); + tabView.setObservingViews( + ScreenshotTabComposite.screenshotViewID, + new String[] { UIPage.sceneListViewID, UIPage.controlListViewID }); + tabView.setObservingViews( + ScreenshotTabComposite.callstackViewID, + new String[] { UIPage.sceneListViewID, UIPage.controlListViewID }); addView(tabView); - { - SnapshotView currentView = new SnapshotView( - tabView.getContentComposite(), SWT.NONE, false, name); - currentView.setObservingViews(new String[] { UISceneListView.ID, - UIControlListView.ID }); - tabView.addView(currentView, false); - CallstackView callstackView = new CallstackView( - tabView.getContentComposite(), SWT.NONE); - callstackView.setObservingViews(new String[] { UISceneListView.ID, - UIControlListView.ID }); - tabView.addView(callstackView, false); - } upperForm.setWeights(new int[] { 37, 40, 23 }); @@ -87,16 +89,28 @@ public class UIPage extends DAPageComposite { bottomForm, SWT.NONE); addView(bottomLeftFirst); bottomForm.setWeights(new int[] { 100 }); - + baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); upperForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH); + + DataManagerRegistry + .registerPageDataManager(UIDataManager.getInstance()); } @Override - protected void setFormWeights() { - upperForm.setWeights(new int[] { 37, 100 - 37 - wRate, wRate }); - baseForm.setWeights(new int[] { hRate, 100 - hRate }); + protected void onResized(int width, int height) { + int wrate = (int) (ScreenshotTabComposite.DEFAULT_WIDTH * 100 / width); + int hrate = (int) (ScreenshotTabComposite.DEFAULT_HEIGHT * 100 / height); + wrate = (wrate > 100) ? 100 : wrate; + hrate = (hrate > 100) ? 100 : hrate; + + if ((wrate > (100 - 37)) || hrate > 100) { + return; + } + + upperForm.setWeights(new int[] { 37, 100 - 37 - wrate, wrate }); + baseForm.setWeights(new int[] { hrate, 100 - hrate }); } } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java index 63c4342..37bc7b5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java @@ -49,13 +49,13 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableCellRenderer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; public class UIControlListTable extends DATreeComposite { - public static final String ID = UIControlListTable.class.getName(); public boolean selfUpdate = false; public UIControlListTable(Composite parent, int compStyle, int tableStyle) { @@ -94,11 +94,8 @@ public class UIControlListTable extends DATreeComposite { long time = getSnapsotForScene(className, data.getTime()); DASelectionData selData = new DASelectionData( - UIControlListView.ID, time, 0, items, table); - - AnalyzerManager.getCurrentPage().controlSelection( - UIControlListView.ID); - AnalyzerManager.getCurrentPage().updatePage(selData); + UIPage.controlListViewID, time, 0, items, table); + AnalyzerManager.getCurrentPage().updateView(selData); setSelfUpdate(true); updateTree(); @@ -106,7 +103,7 @@ public class UIControlListTable extends DATreeComposite { @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub + // do nothing } }); @@ -114,12 +111,12 @@ public class UIControlListTable extends DATreeComposite { @Override public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void mouseDown(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override @@ -141,7 +138,7 @@ public class UIControlListTable extends DATreeComposite { } private long getSnapsotForScene(String className, long strTime) { - Long time = UIDataManager.getInstance().getFindSnapshotViewHashMap() + Long time = UIDataManager.getInstance().getFindScreenshotViewHashMap() .get(className); if (null == time) { return strTime; @@ -149,7 +146,7 @@ public class UIControlListTable extends DATreeComposite { if (time == -1) { time = strTime; } - long result = SqlManager.getInstance().getLastSnapshotTime(time); + long result = SqlManager.getInstance().getLastScreenshotTime(time); if (result == -1) { result = strTime; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java index c472814..43a3554 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java @@ -32,22 +32,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.UserInterfacePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; -import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView; -import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneListView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class UIControlListView extends DAView { - - public static final String ID = UIControlListView.class.getName(); - - int[] innerMaxWeight = { 100, 0, 0 }; - int[] outerMaxWeight = { 100, 0 }; +public class UIControlListView extends DAViewComposite { UIDataManager tManager = UIDataManager.getInstance(); @@ -62,22 +55,18 @@ public class UIControlListView extends DAView { UIControlListTable treeComp = null; private boolean[] columnVisibility = { true, true, true, true, true, true }; private int[] columnAlignment = { SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.LEFT, - SWT.RIGHT}; + SWT.RIGHT }; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NONE, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM }; public UIControlListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_NAME); - - setMaxWeight(innerMaxWeight, outerMaxWeight); + setTitle(UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_NAME); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); treeComp = new UIControlListTable(contents, SWT.NONE, SWT.SINGLE @@ -102,13 +91,20 @@ public class UIControlListView extends DAView { treeComp.updateTree(); } - public void updateView(DASelectionData selData) { - /* only ui page update */ - if (selData.getViewId().equals(UIFunctionProfilingView.ID) - || selData.getViewId().equals(UISceneListView.ID)) { - treeComp.setSelfUpdate(false); - treeComp.updateTree(); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + /* only ui page update */ + if (selData.getViewID().equals(UIPage.profilingViewID) + || selData.getViewID().equals(UIPage.sceneListViewID)) { + treeComp.setSelfUpdate(false); + treeComp.updateTree(); + } } + + // other view selection occurred + treeComp.deselectAll(); } @Override @@ -122,14 +118,4 @@ public class UIControlListView extends DAView { return treeComp; } - @Override - public void updateLog(LogPackage logPack) { - tManager.parsePageData(logPack); - } - - @Override - public void otherViewSelectionOccured() { - treeComp.deselectAll(); - } - } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingTable.java index 6dd3bf9..2dd0eba 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingTable.java @@ -52,6 +52,7 @@ import org.tizen.dynamicanalyzer.nl.UserInterfacePageLabels; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableCellRenderer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; @@ -100,16 +101,14 @@ public class UIFunctionProfilingTable extends DATreeComposite { UIDataManager.getInstance().setTableSeleteClassName(className); DASelectionData selData = new DASelectionData( - UIFunctionProfilingView.ID, 0, 0, items, table); - AnalyzerManager.getCurrentPage().updatePage(selData); - AnalyzerManager.getCurrentPage().controlSelection( - UIFunctionProfilingView.ID); + UIPage.profilingViewID, 0, 0, items, table); + AnalyzerManager.getCurrentPage().updateView(selData); updateTree(); } @Override public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub + // do nothing } }); @@ -117,12 +116,12 @@ public class UIFunctionProfilingTable extends DATreeComposite { @Override public void mouseUp(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override public void mouseDown(MouseEvent e) { - // TODO Auto-generated method stub + // do nothing } @Override 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 51a4845..555ad71 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 @@ -35,21 +35,15 @@ import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.model.ColumnData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.UserInterfacePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; -import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView; -import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneListView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class UIFunctionProfilingView extends DAView { - - public static final String ID = UIFunctionProfilingView.class.getName(); - - int[] innerMaxWeight = { 100 }; - int[] outerMaxWeight = { 0, 100 }; +public class UIFunctionProfilingView extends DAViewComposite { List columnData = null; private String[] columnNames = { @@ -63,26 +57,28 @@ public class UIFunctionProfilingView extends DAView { UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7, UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 }; private int[] columnSizes = { 355, 80, 80, 80, 80, 80, 80, 80, 80 }; - private int[] columnAlignment = { SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, - SWT.RIGHT,SWT.RIGHT,SWT.RIGHT,SWT.RIGHT,SWT.RIGHT}; + private int[] columnAlignment = { SWT.LEFT, SWT.RIGHT, SWT.RIGHT, + SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT }; UIFunctionProfilingTable treeComp = null; private boolean[] columnVisibility = { true, true, true, true, true, true, true, true, true }; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING }; + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING }; public UIFunctionProfilingView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME); - setMaxWeight(innerMaxWeight, outerMaxWeight); - Composite contents = viewContainer.getContentArea(); + setTitle(UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME); + + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); treeComp = new UIFunctionProfilingTable(contents, SWT.NONE, SWT.SINGLE @@ -145,12 +141,20 @@ public class UIFunctionProfilingView extends DAView { treeComp.updateTree(); } - public void updateView(DASelectionData selData) { - /* only ui page update */ - if (selData.getViewId().equals(UIControlListView.ID) - || selData.getViewId().equals(UISceneListView.ID)) { - treeComp.updateTree(); + @Override + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + /* only ui page update */ + if (selData.getViewID().equals(UIPage.controlListViewID) + || selData.getViewID().equals(UIPage.sceneListViewID)) { + treeComp.updateTree(); + } } + + // other view selection occurred + treeComp.deselectAll(); } @Override @@ -164,9 +168,4 @@ public class UIFunctionProfilingView extends DAView { public Control getControl() { return treeComp; } - - @Override - public void otherViewSelectionOccured() { - treeComp.deselectAll(); - } } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneDataChecker.java index 0eb6105..22609cb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneDataChecker.java @@ -53,7 +53,7 @@ public class UISceneDataChecker { .setTransformTime(getTransitionTime(input.getTransitionTime())); getDataList().add(sceneData); - UIDataManager.getInstance().getFindSnapshotViewHashMap() + UIDataManager.getInstance().getFindScreenshotViewHashMap() .put(getClassName(input), input.getTime()); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListTable.java index 10ca92f..98d4dab 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListTable.java @@ -41,6 +41,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.SceneData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; @@ -67,15 +68,11 @@ public class UISceneListTable extends DATableComposite { UIDataManager.getInstance().setTableSeleteClassName(className); - long time = getSnapsotForScene(data.getTime()); + long time = getScreensotForScene(data.getTime()); DASelectionData selData = new DASelectionData( - UISceneListView.ID, time, 0, items, table); - - AnalyzerManager.getCurrentPage().updatePage(selData); - - AnalyzerManager.getCurrentPage().controlSelection( - UISceneListView.ID); + UIPage.sceneListViewID, time, 0, items, table); + AnalyzerManager.getCurrentPage().updateView(selData); updateTable(); } @@ -86,8 +83,8 @@ public class UISceneListTable extends DATableComposite { }); } - private long getSnapsotForScene(long strTime) { - Long result = SqlManager.getInstance().getLastSnapshotTime(strTime); + private long getScreensotForScene(long strTime) { + Long result = SqlManager.getInstance().getLastScreenshotTime(strTime); if (null == result) { return strTime; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java index bb94d9f..d3b9ade 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneListView.java @@ -32,25 +32,21 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.UserInterfacePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView; -import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView; -import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; +import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; -public class UISceneListView extends DAView { - public static final String ID = UISceneListView.class.getName(); +public class UISceneListView extends DAViewComposite { DATableComposite tableComp = null; - int[] innerMaxWeight = { 0, 100, 0 }; - int[] outerMaxWeight = { 100, 0 }; - private int[] columnSizes = { 70,70, 120, 120, 120, 120 }; + private int[] columnSizes = { 70, 70, 120, 120, 120, 120 }; private boolean[] columnVisibility = { true, true, true, true, true }; private int[] columnAlignment = { SWT.RIGHT, SWT.RIGHT, SWT.LEFT, SWT.LEFT, - SWT.LEFT,SWT.RIGHT}; + SWT.LEFT, SWT.RIGHT }; private String[] columnNames = { UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_0, @@ -58,7 +54,7 @@ public class UISceneListView extends DAView { UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_2, UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_3, UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_4, - UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_5}; + UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_5 }; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, @@ -68,14 +64,12 @@ public class UISceneListView extends DAView { AnalyzerConstants.SORT_TYPE_STRING }; public UISceneListView(Composite parent, int style) { - super(parent, style); + super(parent, style, true); this.setLayout(new FillLayout()); - ViewContainer viewContainer = new ViewContainer(this, true); - viewContainer - .setTitleText(UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_NAME); + setTitle(UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_NAME); - Composite contents = viewContainer.getContentArea(); + Composite contents = getContentArea(); contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new UISceneListTable(contents, SWT.NONE, SWT.MULTI @@ -88,7 +82,6 @@ public class UISceneListView extends DAView { tableComp.setColumnSize(columnSizes); tableComp.setColumnVisibility(columnVisibility); tableComp.setTableToolTipEnable(false); - setMaxWeight(innerMaxWeight, outerMaxWeight); contents.addControlListener(new TableColumnSizePackListener(tableComp, columnSizes)); @@ -101,18 +94,24 @@ public class UISceneListView extends DAView { } @Override - public void updateView(DASelectionData selData) { - /* only ui page update */ - if (selData.getViewId().equals(UIControlListView.ID) - || selData.getViewId().equals(UIFunctionProfilingView.ID) - || selData.getViewId().equals(UISceneListView.ID)) { - tableComp.updateTable(); + public void updateView(DAViewData data) { + if (data instanceof DASelectionData) { + DASelectionData selData = (DASelectionData) data; + + /* only ui page update */ + if (selData.getViewID().equals(UIPage.controlListViewID) + || selData.getViewID().equals(UIPage.profilingViewID) + || selData.getViewID().equals(UIPage.sceneListViewID)) { + tableComp.updateTable(); + } } + + // other view selection occurred + tableComp.deselectAll(); } @Override public void clear() { - // TODO Auto-generated method stub tableComp.clear(); } @@ -120,9 +119,4 @@ public class UISceneListView extends DAView { public Control getControl() { return tableComp; } - - @Override - public void otherViewSelectionOccured() { - tableComp.deselectAll(); - } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/FindDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/FindDialog.java index 6bba433..4a3c29f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/FindDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/FindDialog.java @@ -37,7 +37,6 @@ import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.FindProperty; 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 569020a..af124f1 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -62,12 +62,12 @@ import org.tizen.dynamicanalyzer.swap.channel.control.BinaryInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfo; import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; import org.tizen.dynamicanalyzer.ui.page.BaseView; -import org.tizen.dynamicanalyzer.ui.page.DAPageComposite; -import org.tizen.dynamicanalyzer.ui.page.ViewAction; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; -import org.tizen.dynamicanalyzer.ui.widgets.DATabComposite; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; +import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class AnalyzerUtil { // FIXME start @@ -306,13 +306,13 @@ public class AnalyzerUtil { @Override public void run() { DATabComposite tabView = baseView.getMainTab(); - tabView.setSelectTab(pageId); + tabView.selectTab(pageId); } }); } public static Composite getTabPage(String pageId) { - return getMainTab().getTab(pageId); + return getMainTab().getView(pageId); } public static DATabComposite getMainTab() { @@ -320,7 +320,7 @@ public class AnalyzerUtil { return baseView.getMainTab(); } - public static ViewAction getView(String pageId, String viewId) { + public static DABaseComposite getView(String pageId, String viewId) { DAPageComposite page = (DAPageComposite) getTabPage(pageId); return page.getView(viewId); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java index cb925e1..9c8d3fd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java @@ -34,7 +34,7 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -import org.tizen.dynamicanalyzer.ui.info.snapshot.SocketConstants; +import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketConstants; public class JsonUtil { public static final String CMD_SCREENDUMP = "screendump"; -- 2.7.4