opengl : fix. the highlights that have been selected from more that one table.

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: Ia3987936ac9588564aa79fc8aa85300c40127d05

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 2523bbc..ce1b078 100644 (file)
--- 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
@@ -96,6 +96,7 @@ public class CallstackTable extends DATableComposite {
                                || viewId.equals(GLPage.programViewID)
                                || viewId.equals(GLPage.statisticsViewID)
                                || viewId.equals(GLPage.redundantViewID)
+                               || viewId.equals(GLPage.textureViewID)
                                || viewId.equals(UIPage.profilingViewID)
                                || viewId.equals(RangePage.profilingViewID)
                                || viewId.equals(SummaryPage.profilingViewID)) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
index 800fd9e..d79243a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
@@ -112,11 +112,10 @@ public class GLAPIListView extends DAViewComposite {
                        handleEventOfChartView(data);
                } else if (id.equals(GLPage.contextHistoryID)) {
                        handleEventOfContextHistoryButton(data);
-               } else if (id.equals(GLPage.redundantViewID) || id.equals(GLPage.statisticsViewID)
-                               || id.equals(GLPage.apiListViewID)) {
+               } else if (!id.endsWith(this.ID)) {
                        glAPIListTable.removeSelection();
-                       glAPIListTable.updateTable();
                }
+               glAPIListTable.updateTable();
        }
 
        private void handleEventOfChartView(GLSelectionData data) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
index b4abf8a..0773192 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
@@ -79,7 +79,6 @@ public class GLAPITable extends DATableComposite {
                                                frameIndex, contextId);
                                AnalyzerManager.getCurrentPage().updateView(selData);
                                AnalyzerManager.updateView(GLPage.apiListViewID, selData);
-
                        }
 
                        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLRedundantTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLRedundantTableView.java
index ba83773..97653b1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLRedundantTableView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLRedundantTableView.java
@@ -34,7 +34,6 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.nl.GLPageLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
-import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator;
 import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener;
@@ -98,11 +97,10 @@ public class GLRedundantTableView extends DAViewComposite {
                        return;
                }
                String id = ((GLSelectionData) vdata).getViewID();
-               if (id.equals(GLPage.redundantViewID) || id.equals(GLPage.statisticsViewID)
-                               || id.equals(GLPage.apiListViewID)) {
+               if (!id.endsWith(this.ID)) {
                        tableComp.removeSelection();
-                       tableComp.updateTable();
                }
+               tableComp.updateTable();
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java
index 4a75b3e..0a9adf4 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java
@@ -34,7 +34,6 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.nl.GLPageLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
-import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator;
 import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener;
@@ -96,11 +95,10 @@ public class GLStatisticsTableView extends DAViewComposite {
                        return;
                }
                String id = ((GLSelectionData) vdata).getViewID();
-               if (id.equals(GLPage.redundantViewID) || id.equals(GLPage.statisticsViewID)
-                               || id.equals(GLPage.apiListViewID)) {
+               if (!id.endsWith(this.ID)) {
                        tableComp.removeSelection();
-                       tableComp.updateTable();
                }
+               tableComp.updateTable();
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLTextureTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLTextureTable.java
index 1f7659a..2a7b163 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLTextureTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLTextureTable.java
@@ -34,10 +34,13 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
+import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.model.TableInput;
 import org.tizen.dynamicanalyzer.nl.GLPageLabels;
+import org.tizen.dynamicanalyzer.ui.opengl.GLPage;
 import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataManager;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLConstantDefine;
+import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLStateTextureType;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -54,6 +57,9 @@ public class GLTextureTable extends DATableComposite {
                                if (null == items) {
                                        return;
                                }
+                               GLSelectionData selData = new GLSelectionData(GLPage.textureViewID, -1, -1, items,
+                                               table, -1, -1);
+                               AnalyzerManager.getCurrentPage().updateView(selData);
                        }
 
                        @Override