From 3726a92096bd226d9b0df31a3ff0032a42797f9f Mon Sep 17 00:00:00 2001 From: jaeyong lee Date: Tue, 28 Jun 2016 15:37:03 +0900 Subject: [PATCH] [SRADA-831] Implement logic that disable modify weight of each pages when detail mode is off Change-Id: I4c1c945e61c211aaffe03e9e129a6d8a4052765d --- .../widgets/da/view/DAPageComposite.java | 2 +- .../org/tizen/dynamicanalyzer/ui/file/FilePage.java | 20 ++++++++++++++++++++ .../tizen/dynamicanalyzer/ui/memory/MemoryPage.java | 20 ++++++++++++++++++++ .../dynamicanalyzer/ui/network/NetworkPage.java | 20 ++++++++++++++++++++ .../org/tizen/dynamicanalyzer/ui/opengl/GLPage.java | 20 ++++++++++++++++++++ .../org/tizen/dynamicanalyzer/ui/page/MenuBar.java | 3 +++ .../tizen/dynamicanalyzer/ui/thread/ThreadPage.java | 20 ++++++++++++++++++++ .../dynamicanalyzer/ui/timeline/TimelinePage.java | 20 ++++++++++++++++++++ 8 files changed, 124 insertions(+), 1 deletion(-) 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 index efe12f9..7ffda69 100644 --- 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 @@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Composite; public abstract class DAPageComposite extends DABaseComposite { public static final String KEY_TOOLTIP = "tooltip"; - private HashMap childMap = null; + protected HashMap childMap = null; private DAViewData selection = null; private boolean isToplevel = true; 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 2079fbf..c0fae4a 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 @@ -26,10 +26,13 @@ package org.tizen.dynamicanalyzer.ui.file; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -38,6 +41,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.file.manager.FileDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.util.Logger; +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.widgets.da.view.DAViewComposite; @@ -149,4 +153,20 @@ public class FilePage extends DAPageComposite { FileDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java index 386f907..0ade2be 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryPage.java @@ -24,10 +24,13 @@ package org.tizen.dynamicanalyzer.ui.memory; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -37,6 +40,7 @@ import org.tizen.dynamicanalyzer.ui.memory.data.HeapDataManager; import org.tizen.dynamicanalyzer.ui.memory.data.MemoryDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.util.Logger; +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.widgets.da.view.DAViewComposite; @@ -166,4 +170,20 @@ public class MemoryPage extends DAPageComposite { MemoryDataManager.getInstance().clear(); HeapDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } 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 13f383d..63a3b77 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 @@ -26,10 +26,13 @@ package org.tizen.dynamicanalyzer.ui.network; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -38,6 +41,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry; import org.tizen.dynamicanalyzer.ui.network.data.NetworkDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.util.Logger; +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.widgets.da.view.DAViewComposite; @@ -148,4 +152,20 @@ public class NetworkPage extends DAPageComposite { NetworkDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java index 6a4131b..09eff96 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLPage.java @@ -27,10 +27,13 @@ package org.tizen.dynamicanalyzer.ui.opengl; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; @@ -45,6 +48,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLStatisticsTableView; import org.tizen.dynamicanalyzer.ui.opengl.table.state.GLTextureTableView; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.util.Logger; +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.widgets.da.view.DAViewComposite; @@ -175,4 +179,20 @@ public class GLPage extends DAPageComposite { super.clear(); GLDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java index 9cf4120..305353e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/MenuBar.java @@ -35,6 +35,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DAState; import org.tizen.dynamicanalyzer.common.Global; import org.tizen.dynamicanalyzer.communicator.DACommunicator; @@ -437,6 +438,8 @@ public class MenuBar { glPage.setDetailMode(true); } } + + AnalyzerManager.getCurrentPage().updateView(); } } }; 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 c3db618..95e5ca4 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 @@ -28,10 +28,13 @@ */ package org.tizen.dynamicanalyzer.ui.thread; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -41,6 +44,7 @@ import org.tizen.dynamicanalyzer.ui.thread.chart.ThreadChartView; import org.tizen.dynamicanalyzer.ui.thread.data.ThreadDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.util.Logger; +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.widgets.da.view.DAViewComposite; @@ -153,4 +157,20 @@ public class ThreadPage extends DAPageComposite { ThreadDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } 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 3b3ba36..06eb3ca 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 @@ -27,10 +27,13 @@ package org.tizen.dynamicanalyzer.ui.timeline; +import java.util.Map; + 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.eclipse.swt.widgets.Sash; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; @@ -49,6 +52,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartView; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineTableView; import org.tizen.dynamicanalyzer.ui.timeline.dlog.DLogDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.replay.data.ReplayDataManager; +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.widgets.da.view.DAViewComposite; @@ -174,4 +178,20 @@ public class TimelinePage extends DAPageComposite { FunctionUsageProfiler.getInstance().clear(); SummaryDataManager.getInstance().clear(); } + + @Override + public void updateView() { + for (Map.Entry entry : childMap.entrySet()) { + entry.getValue().updateView(); + } + if(!isDetailMode) { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(false); + } + } else { + if(baseForm.getChildren().length > 2) { + ((Sash)baseForm.getChildren()[2]).setVisible(true); + } + } + } } -- 2.7.4