[Title] Edit Chart white theme

[Type] bug.
[Module] DA - Edit Chart Dlg.
[Priority] high
[CQ#]
[Redmine#] 6014
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java
index 6d9894a..ef5f6ea 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.model.LogCenter;
 import org.tizen.dynamicanalyzer.model.Project;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.theme.DAThemeBlack;
+import org.tizen.dynamicanalyzer.theme.DAThemeWhite;
 import org.tizen.dynamicanalyzer.threads.InsertLogThread;
 import org.tizen.dynamicanalyzer.threads.OpenTraceInputThread;
 import org.tizen.dynamicanalyzer.threads.RecordStartStopThread;
@@ -104,7 +105,7 @@ public class AnalyzerManager {
        public static DATheme getTheme() {
                if (null == theme) {
                         theme = DAThemeBlack.getInstance();
-//                     theme = DAThemeWhite.getInstance();
+               //      theme = DAThemeWhite.getInstance();
                }
                return theme;
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
index 520d737..3e0dc23 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
@@ -62,7 +62,6 @@ public class TimelineEditItemsDialog extends Dialog {
        public TimelineEditItemsDialog(Shell parent, int style) {
                super(parent);
                this.parent = parent;
-
                setShellStyle(getShellStyle() | SWT.MAX | SWT.RESIZE);
        }
 
@@ -86,16 +85,13 @@ public class TimelineEditItemsDialog extends Dialog {
 
                                if (tableitems[i].getText(3).equals("selected enable")) {
                                        selectedItemList.add(tableitems[i].getText(2));
-
                                        strSaveSelectedItems.append(tableitems[i].getText(2));
                                        strSaveSelectedItems.append(",");
-
                                }
                        }
 
                        TimelineItemsProvider.setAvailableItemsList(availableItemList);
                        TimelineItemsProvider.setSelectedItemList(selectedItemList);
-
                        TimelineComposite timelineComposite = AnalyzerUtil
                                        .getTimelineComposite();
                        if (null != timelineComposite) {
@@ -145,25 +141,20 @@ public class TimelineEditItemsDialog extends Dialog {
                data.right = new FormAttachment(100, 0);
                editorContainer.setLayoutData(data);
                editorContainer.setBackground(ColorResources.EDIT_CHART_DIALOG_UPPER);
-               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI
-                               | SWT.FULL_SELECTION | SWT.BORDER);
+               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI | SWT.FULL_SELECTION );
                GridData tableGridData = new GridData(GridData.FILL_BOTH);
                chartTableViewer.getTable().setLayoutData(tableGridData);
                chartTableViewer.getTable().setLinesVisible(true);
 
                for (int i = 0; i < 4; i++) {
                        if (i == 0)
-                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
-                                               .setWidth(82);
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(82);
                        else if (i == 1)
-                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
-                                               .setWidth(316);
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(330);
                        else if (i == 2)
-                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
-                                               .setWidth(0);
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(0);
                        else if (i == 3)
-                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
-                                               .setWidth(0);
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(0);
                }
 
                List<String> availableItemsList = TimelineItemsProvider
@@ -212,17 +203,19 @@ public class TimelineEditItemsDialog extends Dialog {
                                }
                                case SWT.PaintItem: {
 
+                                       
+                                       int width = chartTableViewer.getTable().getClientArea().width;
+       
+                                       
                                        TableItem item = (TableItem) event.item;
 
                                        String itemName = item.getText(event.index + 1);
                                        Point size = event.gc.textExtent(itemName);
-                                       int offset2 = event.index == 0 ? Math.max(0,
-                                                       (event.height - size.y) / 2) : 0;
+                                       int offset2 = event.index == 0 ? Math.max(0, (event.height - size.y) / 2) : 0;
 
                                        String itemExplan = TimelineChartLabels.ADD_CHART_DLG_ITEM_SUB;
                                        size = event.gc.textExtent(itemExplan);
-                                       offset2 = event.index == 0 ? Math.max(0,
-                                                       (event.height - size.y) / 2) : 0;
+                                       offset2 = event.index == 0 ? Math.max(0, (event.height - size.y) / 2) : 0;
 
                                        String strItemStatus_1 = item.getText(3);
 
@@ -238,47 +231,46 @@ public class TimelineEditItemsDialog extends Dialog {
                                                event.gc.setForeground(ColorResources.ADD_CHART_DISABLE_COLOR_START);
                                                event.gc.setBackground(ColorResources.ADD_CHART_DISABLE_COLOR_END);
                                        }
-                                       event.gc.fillGradientRectangle(0, rect.y, 402, 66, true);
+                                       
+                                       
+                                       
+                                       event.gc.fillGradientRectangle(0, rect.y, width, 66, true);
                                        gc.setForeground(foreground);
                                        gc.setBackground(background);
                                        event.detail &= ~SWT.SELECTED;
 
                                        if (strItemStatus_1.equals("selected enable")
                                                        && event.index == 1) {
-                                               event.gc.drawImage(ImageResources.ADD_CHART_ON, 370,
-                                                               event.y + 15);
+                                               event.gc.drawImage(ImageResources.ADD_CHART_ON, 370,event.y + 15);
                                        } else {
-                                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370,
-                                                               event.y + 15);
+                                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370,event.y + 15);
                                        }
 
                                        String strItemName = item.getText(2);
-                                       Image itemImage = null;
+                                       Image itemImage = ImageResources.ADD_CHART_CPU;
                                        if (strItemName.equalsIgnoreCase("cpu")) {
                                                itemImage = ImageResources.ADD_CHART_CPU;
-                                       } else if (strItemName.equalsIgnoreCase("cpu core")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.CPU_CORE_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_CPU_CORE;
-                                       } else if (strItemName.equalsIgnoreCase("heap Allocation")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.HEAP_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_HEAP;
-                                       } else if (strItemName.equalsIgnoreCase("process size")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_PROCESS;
-                                       } else if (strItemName.equalsIgnoreCase("memory")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_ALLOCATION;
-                                       } else if (strItemName.equalsIgnoreCase("ui event")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.SNAPSHOT_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_UI_EVENT;
-                                       } else if (strItemName.equalsIgnoreCase("file")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.FILE_CHART_TITLE )) {
                                                itemImage = ImageResources.ADD_CHART_READ_WRITE;
-                                       } else if (strItemName.equalsIgnoreCase("cpu frequency")) {
+                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_CPU_FREQUENCY;
                                        }
                                        if (event.index == 0) {
                                                event.gc.drawImage(itemImage, 3, event.y);
                                        } else if (event.index == 1) {
-                                               event.gc.drawText(itemName, event.x + 20, event.y
-                                                               + offset2 + 15, true);
+                                               event.gc.drawText(itemName, event.x + 20, event.y+ offset2 + 15, true);
                                                event.gc.setForeground(ColorResources.BLACK);
-                                               event.gc.drawText(itemExplan, event.x + 20, event.y
-                                                               + offset2 + 35, true);
+                                               event.gc.drawText(itemExplan, event.x + 20, event.y+ offset2 + 35, true);
                                        }
                                        break;
                                }
@@ -292,20 +284,16 @@ public class TimelineEditItemsDialog extends Dialog {
                chartTableViewer.getTable().addListener(SWT.MeasureItem, paintListener);
                chartTableViewer.getTable().addListener(SWT.PaintItem, paintListener);
                chartTableViewer.getTable().addListener(SWT.EraseItem, paintListener);
-
                chartTableViewer.getTable().addMouseListener(itemZoomMouseListener);
 
                Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
-
-               DragSource source = new DragSource(chartTableViewer.getTable(),
-                               DND.DROP_MOVE | DND.DROP_COPY);
+               DragSource source = new DragSource(chartTableViewer.getTable(), DND.DROP_MOVE | DND.DROP_COPY);
                source.setTransfer(types);
                source.addDragListener(new DragSourceAdapter() {
                        public void dragSetData(DragSourceEvent event) {
                                DragSource ds = (DragSource) event.widget;
                                Table table = (Table) ds.getControl();
                                TableItem[] selection = table.getSelection();
-
                                StringBuffer buff = new StringBuffer();
                                for (int i = 0, n = selection.length; i < n; i++) {
                                        buff.append(selection[i].getText());
@@ -316,8 +304,7 @@ public class TimelineEditItemsDialog extends Dialog {
                        }
                });
 
-               DropTarget target = new DropTarget(chartTableViewer.getTable(),
-                               DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT);
+               DropTarget target = new DropTarget(chartTableViewer.getTable(),DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT);
                target.setTransfer(types);
                target.addDropListener(new DropTargetAdapter() {
                        public void dragEnter(DropTargetEvent event) {
@@ -325,12 +312,10 @@ public class TimelineEditItemsDialog extends Dialog {
                                ItemIndexA = chartTableViewer.getTable().getSelectionIndex();
 
                                if (event.detail == DND.DROP_DEFAULT) {
-                                       event.detail = (event.operations & DND.DROP_COPY) != 0 ? DND.DROP_COPY
-                                                       : DND.DROP_NONE;
+                                       event.detail = (event.operations & DND.DROP_COPY) != 0 ? DND.DROP_COPY: DND.DROP_NONE;
                                }
                                for (int i = 0, n = event.dataTypes.length; i < n; i++) {
-                                       if (TextTransfer.getInstance().isSupportedType(
-                                                       event.dataTypes[i])) {
+                                       if (TextTransfer.getInstance().isSupportedType(event.dataTypes[i])) {
                                                event.currentDataType = event.dataTypes[i];
                                        }
                                }
@@ -342,8 +327,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                DropTarget target = (DropTarget) event.widget;
                                Table table = (Table) target.getControl();
 
-                               Point point = shell.getDisplay().map(null, table, event.x,
-                                               event.y);
+                               Point point = shell.getDisplay().map(null, table, event.x,event.y);
                                TableItem tblItemTarget = table.getItem(point);
                                if (tblItemTarget == null) {
                                        return;
@@ -352,8 +336,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                ItemIndexB = table.indexOf(tblItemTarget);
 
                                if (ItemDragOverIndex != ItemIndexB) {
-                                       TableItem[] chartTableItems = chartTableViewer.getTable()
-                                                       .getItems();
+                                       TableItem[] chartTableItems = chartTableViewer.getTable().getItems();
 
                                        String strIndexA = null;
                                        String strIndexB = null;
@@ -382,10 +365,8 @@ public class TimelineEditItemsDialog extends Dialog {
                        }
 
                        public void drop(DropTargetEvent event) {
-
                                if (TextTransfer.getInstance().isSupportedType(
                                                event.currentDataType)) {
-
                                }
                        }
                });
@@ -402,7 +383,7 @@ public class TimelineEditItemsDialog extends Dialog {
 
                DAButton okButton = new DAButton(buttonComp, SWT.PUSH);
                okButton.addClickListener(okButtonListener);
-               okButton.setText("OK"); //$NON-NLS-1$
+               okButton.setText("OK");
                data = new FormData();
                data.top = new FormAttachment(0, 8);
                data.left = new FormAttachment(0, 119);
@@ -411,9 +392,8 @@ public class TimelineEditItemsDialog extends Dialog {
                okButton.setLayoutData(data);
 
                DAButton cancelButton = new DAButton(buttonComp, SWT.PUSH);
-               // cancelButton.addListener(SWT.Selection, cancelButtonListener);
                cancelButton.addClickListener(cancelButtonListener);
-               cancelButton.setText("CANCEL"); //$NON-NLS-1$
+               cancelButton.setText("CANCEL");
                data = new FormData();
                data.top = new FormAttachment(0, 8);
                data.left = new FormAttachment(okButton, 8);
@@ -422,7 +402,6 @@ public class TimelineEditItemsDialog extends Dialog {
                cancelButton.setLayoutData(data);
 
                buttonComp.addPaintListener(new PaintListener() {
-
                        @Override
                        public void paintControl(PaintEvent e) {
                                Composite comp = (Composite) e.widget;
@@ -430,32 +409,26 @@ public class TimelineEditItemsDialog extends Dialog {
                                e.gc.setForeground(ColorResources.DIALOG_SUNKEN_1);
                                e.gc.drawLine(rect.x, rect.y, rect.x + rect.width, rect.y);
                                e.gc.setForeground(ColorResources.DIALOG_SUNKEN_2);
-                               e.gc.drawLine(rect.x, rect.y + 1, rect.x + rect.width,
-                                               rect.y + 1);
+                               e.gc.drawLine(rect.x, rect.y + 1, rect.x + rect.width, rect.y + 1);
                        }
                });
 
                shell.open();
-
                return 0;
        }
 
+
+        
        private MouseListener itemZoomMouseListener = new MouseAdapter() {
                public void mouseUp(MouseEvent event) {
                        if (chartChangeSatus == true) {
-
                                Table table = chartTableViewer.getTable();
                                int selectItemIndex = table.getSelectionIndex();
-                               TableItem[] chartTableItems = chartTableViewer.getTable()
-                                               .getItems();
-                               if (chartTableItems[selectItemIndex].getText(3).equals(
-                                               "selected enable")) {
-                                       chartTableItems[selectItemIndex].setText(3,
-                                                       "selected disable");
-                               } else if (chartTableItems[selectItemIndex].getText(3).equals(
-                                               "selected disable")) {
-                                       chartTableItems[selectItemIndex].setText(3,
-                                                       "selected enable");
+                               TableItem[] chartTableItems = chartTableViewer.getTable().getItems();
+                               if (chartTableItems[selectItemIndex].getText(3).equals("selected enable")) {
+                                       chartTableItems[selectItemIndex].setText(3,"selected disable");
+                               } else if (chartTableItems[selectItemIndex].getText(3).equals("selected disable")) {
+                                       chartTableItems[selectItemIndex].setText(3,"selected enable");
                                }
                                chartTableViewer.getTable().redraw();
                        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/DAFileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/DAFileChart.java
index 532f3a6..2e8d45d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/DAFileChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/DAFileChart.java
@@ -36,6 +36,7 @@ import org.tizen.dynamicanalyzer.model.LogCenter;
 import org.tizen.dynamicanalyzer.ui.views.CoolbarArea;
 import org.tizen.dynamicanalyzer.ui.views.filePage.FileApiListView;
 import org.tizen.dynamicanalyzer.ui.views.filePage.FileChartView;
+import org.tizen.dynamicanalyzer.ui.views.filePage.FileDetailInfoView;
 import org.tizen.dynamicanalyzer.ui.widgets.DATable.DATableEmptyCellRenderer;
 import org.tizen.dynamicanalyzer.ui.widgets.DATable.DATableEmptyColumnHeaderRenderer;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
@@ -104,14 +105,12 @@ public class DAFileChart extends Composite {
                        @Override
                        public void controlMoved(ControlEvent e) {
                                // TODO Auto-generated method stub
-
                        }
                });
                tree.addPaintListener(new PaintListener() {
 
                        @Override
                        public void paintControl(PaintEvent e) {
-       
                                if (columnResizing) {
                                        Rectangle rect = tree.getClientArea();
                                        fileColumnWidth = rect.width
@@ -352,12 +351,17 @@ public class DAFileChart extends Composite {
                        }
                }
 
+               
+               
                if (null != selections) {
                        tree.setSelection(selections);
-               }               
+               }
+               
+       
+               UpdateDetailsView();
        }
        
-       public void UpdateDetailsView()
+       public void UpdateDetailsView(  )
        {
                GridItem[] ti = tree.getSelection();
                if (ti == null || ti.length == 0) {
@@ -371,7 +375,11 @@ public class DAFileChart extends Composite {
                }
                
                DASelectionData data = new DASelectionData(FileChartView.ID, 0,0, ti[0], tree);
-               AnalyzerManager.getCurrentPage().updatePage(data);
+               List<String> views = new ArrayList<String>();
+               views.add(FileDetailInfoView.ID);
+               AnalyzerManager.getCurrentPage().updateSelectedViews(data, views);
+               
+               
        }
 
        private HashMap<Integer, Boolean> getExpandMap() {
@@ -429,8 +437,7 @@ public class DAFileChart extends Composite {
                List<String> views = new ArrayList<String>();
                views.add(FileApiListView.ID);
                if (sels.length > 0) {
-                       AnalyzerManager.getCurrentPage()
-                                       .updateSelectedViews(selData, views);
+                       AnalyzerManager.getCurrentPage().updateSelectedViews(selData, views);
                }
        }
 
@@ -459,7 +466,6 @@ public class DAFileChart extends Composite {
 
                @Override
                public void widgetSelected(SelectionEvent e) {
-                       // updateTree();
                        int sel = scale.getSelection();
                        if (sel == 0) {
                                FileChartManager.setScale(1);
@@ -477,6 +483,7 @@ public class DAFileChart extends Composite {
 
                @Override
                public void widgetDefaultSelected(SelectionEvent e) {
+                       System.out.print("15\n");
                }
        };
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/FileChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/FileChartManager.java
index 8443ebe..fa27847 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/FileChartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/filePage/fileChart/FileChartManager.java
@@ -327,11 +327,6 @@ public class FileChartManager {
                                AnalyzerManager.getCalledFunctionChecker().getFailedList().add(ffd);
                                
                                
-                               
-                               
-                               
-       
-       
                                FileChartItemData child = getFDRegister().get(fd);
                                if (null == child) {
                                        continue;
@@ -366,8 +361,7 @@ public class FileChartManager {
 
                                        }
                                
-                                       
-                                       
+
                                        // calculate read/write size
                                        String rwSizeStr1 = input.get(LogCenterConstants.RESOURCE_SIZE_INDEX);
                                        long rwSize = Long.parseLong(rwSizeStr1);