[Title] edit chart button fix
authorLee <jy.exe.lee@samsung.com>
Thu, 26 Jul 2012 08:06:40 +0000 (17:06 +0900)
committerLee <jy.exe.lee@samsung.com>
Thu, 26 Jul 2012 08:06:40 +0000 (17:06 +0900)
[Type]
[Module] DynamicAnalyzer
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAButton.java

index 01058bf..96c312f 100644 (file)
@@ -2,12 +2,29 @@ package org.tizen.dynamicanalyzer.timeline;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSource;
+import org.eclipse.swt.dnd.DragSourceAdapter;
+import org.eclipse.swt.dnd.DragSourceEvent;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetAdapter;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
@@ -19,16 +36,10 @@ import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.ConfigureManager;
 import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
+import org.tizen.dynamicanalyzer.ui.widgets.DAButton;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 
 public class TimelineEditItemsDialog extends Dialog {
 
@@ -37,11 +48,10 @@ public class TimelineEditItemsDialog extends Dialog {
        private List<String> selectedItemsList;
        private TableViewer chartTableViewer;
        private boolean chartChangeSatus = true;
-       
+
        private int ItemIndexA = 0;
        private int ItemIndexB = 0;
        private int ItemDragOverIndex = 0;
-       
 
        public TimelineEditItemsDialog(Shell parent, int style) {
                super(parent);
@@ -50,101 +60,109 @@ public class TimelineEditItemsDialog extends Dialog {
                setShellStyle(getShellStyle() | SWT.MAX | SWT.RESIZE);
        }
 
-       private Listener okButtonListener = new Listener() {
-               public void handleEvent(Event event) {
-                       if (event.type == SWT.Selection) {
-
-                               TableItem[] tableitems = chartTableViewer.getTable().getItems();
-
-                               List<String> availableItemList = new ArrayList<String>();
-                               List<String> selectedItemList = new ArrayList<String>();
-                               
-                               StringBuffer strSaveAvailableItems = new StringBuffer(""); 
-                               StringBuffer strSaveSelectedItems = new StringBuffer("");
-
-                               for (int i = 0; i < tableitems.length; i++) {
-                                       availableItemList.add(tableitems[i].getText(2));
-                                       
-                                       
-                                       strSaveAvailableItems.append(tableitems[i].getText(2));
-                                       strSaveAvailableItems.append(",");
-                                       
-                                       if ( tableitems[i].getText(3).equals("selected enable") ){
-                                               selectedItemList.add(tableitems[i].getText(2));
-                                               
-                                               strSaveSelectedItems.append(tableitems[i].getText(2));
-                                               strSaveSelectedItems.append(",");
-                               
-                                       }
-                               }
+       private DACustomButtonClickEventListener okButtonListener = new DACustomButtonClickEventListener() {
+
+               @Override
+               public void handleClickEvent(DACustomButton button) {
+                       TableItem[] tableitems = chartTableViewer.getTable().getItems();
+
+                       List<String> availableItemList = new ArrayList<String>();
+                       List<String> selectedItemList = new ArrayList<String>();
+
+                       StringBuffer strSaveAvailableItems = new StringBuffer("");
+                       StringBuffer strSaveSelectedItems = new StringBuffer("");
+
+                       for (int i = 0; i < tableitems.length; i++) {
+                               availableItemList.add(tableitems[i].getText(2));
 
-                               TimelineItemsProvider.setAvailableItemsList( availableItemList );
-                               TimelineItemsProvider.setSelectedItemList(selectedItemList);
+                               strSaveAvailableItems.append(tableitems[i].getText(2));
+                               strSaveAvailableItems.append(",");
+
+                               if (tableitems[i].getText(3).equals("selected enable")) {
+                                       selectedItemList.add(tableitems[i].getText(2));
+
+                                       strSaveSelectedItems.append(tableitems[i].getText(2));
+                                       strSaveSelectedItems.append(",");
 
-                               TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
-                               if (null != timelineComposite) {
-                                       timelineComposite.resetItems(selectedItemList);
-                                       TimelineMaster.getInstance().redrawTimeTickCanvas();
                                }
-                       
-                               ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, strSaveAvailableItems.toString());
-                               ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, strSaveSelectedItems.toString());
-                               shell.dispose();
                        }
+
+                       TimelineItemsProvider.setAvailableItemsList(availableItemList);
+                       TimelineItemsProvider.setSelectedItemList(selectedItemList);
+
+                       TimelineComposite timelineComposite = AnalyzerUtil
+                                       .getTimelineComposite();
+                       if (null != timelineComposite) {
+                               timelineComposite.resetItems(selectedItemList);
+                               TimelineMaster.getInstance().redrawTimeTickCanvas();
+                       }
+
+                       ConfigureManager
+                                       .getInstance()
+                                       .setValue(
+                                                       ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST,
+                                                       strSaveAvailableItems.toString());
+                       ConfigureManager.getInstance().setValue(
+                                       ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST,
+                                       strSaveSelectedItems.toString());
+                       shell.dispose();
                }
        };
-       
 
-       private Listener cancelButtonListener = new Listener() {
+       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() {
+
                @Override
-               public void handleEvent(Event event) {
-                       if (event.type == SWT.Selection) {
-                               shell.dispose();
-                       }
+               public void handleClickEvent(DACustomButton button) {
+                       shell.dispose();
                }
        };
 
        @Override
        public int open() {
-               
+
                shell = new Shell(parent, SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
                shell.setText("Edit Chart");
                shell.setSize(446, 450);
 
                GridLayout editoeLayout = new GridLayout();
-               Composite editorContainer = new Composite(shell, SWT.NONE );
+               Composite editorContainer = new Composite(shell, SWT.NONE);
                editorContainer.setLayout(editoeLayout);
                editorContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-               shell.setLayout(editoeLayout);  
-               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI | SWT.FULL_SELECTION  | SWT.BORDER );
+               shell.setLayout(editoeLayout);
+               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI
+                               | SWT.FULL_SELECTION | SWT.BORDER);
                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);
-                       else if  (i == 1)
-                               new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(316);
-                       else if  (i == 2)
-                               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(82);
+                       else if (i == 1)
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
+                                               .setWidth(316);
+                       else if (i == 2)
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
+                                               .setWidth(0);
+                       else if (i == 3)
+                               new TableColumn(chartTableViewer.getTable(), SWT.NONE)
+                                               .setWidth(0);
                }
-               
-               
-               List<String> availableItemsList = TimelineItemsProvider.getAvailableItemsList();
+
+               List<String> availableItemsList = TimelineItemsProvider
+                               .getAvailableItemsList();
                if (null == availableItemsList || availableItemsList.isEmpty()) {
                        return -1;
                }
-               
+
                int availableItemsListSize = availableItemsList.size();
                selectedItemsList = TimelineItemsProvider.getSelectedItemsList();
-               
+
                if (null == selectedItemsList) {
                        return -1;
                }
-               
+
                final TableItem[] items = new TableItem[availableItemsListSize];
                for (int i = 0; i < availableItemsListSize; i++) {
                        items[i] = new TableItem(chartTableViewer.getTable(), SWT.NONE, i);
@@ -153,122 +171,117 @@ public class TimelineEditItemsDialog extends Dialog {
                        items[i].setText(1, " ");
                        items[i].setText(2, availableItemsList.get(i));
                        items[i].setText(3, "selected disable");
-                       
+
                        for (int j = 0; j < selectedItemsList.size(); j++) {
-                               if ( availableItemsList.get(i).equals(selectedItemsList.get(j))){
+                               if (availableItemsList.get(i).equals(selectedItemsList.get(j))) {
                                        items[i].setText(3, "selected enable");
                                        break;
                                }
                        }
                }
-                       
-           Listener paintListener = new Listener() {
-               public void handleEvent(Event event) {
-                 switch (event.type) {
-                 case SWT.MeasureItem: {
-                         
-                   TableItem item = (TableItem) event.item;
-                   String text = item.getText(event.index+1);
-                   Point size = event.gc.textExtent(text);
-                   event.width = size.x;
-                   event.height = Math.max(event.height, size.y);
-                   
-                   break;
-                 }
-                 case SWT.PaintItem: {
-                         
-                   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;
-                   
-                   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;
-
-                   
-                   String strItemStatus_1 = item.getText(3);
-                   
-                   GC gc = event.gc;
-                       event.gc.setAdvanced(true);
-                   Rectangle rect = event.getBounds();
-                   Color foreground = gc.getForeground();
-                   Color background = gc.getBackground();
-                   if ( strItemStatus_1.equals("selected enable") ){
-                           event.gc.setForeground(ColorResources.ADD_CHART_ENABLE_COLOR_START);
-                           event.gc.setBackground(ColorResources.ADD_CHART_ENABLE_COLOR_END);
-                   }
-                   else{
-                                   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);
-                   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 );
-                   }
-                   else{
-                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370, event.y+15 );
-                   }
-
-                   String strItemName = item.getText(2);
-                   Image itemImage =null;
-                       if (strItemName.equalsIgnoreCase("cpu")){
-                               itemImage = ImageResources.ADD_CHART_CPU;
-                               }
-                               else if (strItemName.equalsIgnoreCase("cpu core")){
-                                       itemImage = ImageResources.ADD_CHART_CPU_CORE;
-                               }
-                               else if (strItemName.equalsIgnoreCase("heap Allocation")){
-                                       itemImage = ImageResources.ADD_CHART_MEMORY_HEAP;
-                               }
-                               else if (strItemName.equalsIgnoreCase("process size")){
-                                       itemImage = ImageResources.ADD_CHART_MEMORY_PROCESS;
-                               }
-                               else if (strItemName.equalsIgnoreCase("memory")){
-                                       itemImage = ImageResources.ADD_CHART_MEMORY_ALLOCATION;
+
+               Listener paintListener = new Listener() {
+                       public void handleEvent(Event event) {
+                               switch (event.type) {
+                               case SWT.MeasureItem: {
+
+                                       TableItem item = (TableItem) event.item;
+                                       String text = item.getText(event.index + 1);
+                                       Point size = event.gc.textExtent(text);
+                                       event.width = size.x;
+                                       event.height = Math.max(event.height, size.y);
+
+                                       break;
                                }
-                               else if (strItemName.equalsIgnoreCase("ui event")){
-                                       itemImage = ImageResources.ADD_CHART_UI_EVENT;
+                               case SWT.PaintItem: {
+
+                                       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;
+
+                                       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;
+
+                                       String strItemStatus_1 = item.getText(3);
+
+                                       GC gc = event.gc;
+                                       event.gc.setAdvanced(true);
+                                       Rectangle rect = event.getBounds();
+                                       Color foreground = gc.getForeground();
+                                       Color background = gc.getBackground();
+                                       if (strItemStatus_1.equals("selected enable")) {
+                                               event.gc.setForeground(ColorResources.ADD_CHART_ENABLE_COLOR_START);
+                                               event.gc.setBackground(ColorResources.ADD_CHART_ENABLE_COLOR_END);
+                                       } else {
+                                               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);
+                                       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);
+                                       } else {
+                                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370,
+                                                               event.y + 15);
+                                       }
+
+                                       String strItemName = item.getText(2);
+                                       Image itemImage = null;
+                                       if (strItemName.equalsIgnoreCase("cpu")) {
+                                               itemImage = ImageResources.ADD_CHART_CPU;
+                                       } else if (strItemName.equalsIgnoreCase("cpu core")) {
+                                               itemImage = ImageResources.ADD_CHART_CPU_CORE;
+                                       } else if (strItemName.equalsIgnoreCase("heap Allocation")) {
+                                               itemImage = ImageResources.ADD_CHART_MEMORY_HEAP;
+                                       } else if (strItemName.equalsIgnoreCase("process size")) {
+                                               itemImage = ImageResources.ADD_CHART_MEMORY_PROCESS;
+                                       } else if (strItemName.equalsIgnoreCase("memory")) {
+                                               itemImage = ImageResources.ADD_CHART_MEMORY_ALLOCATION;
+                                       } else if (strItemName.equalsIgnoreCase("ui event")) {
+                                               itemImage = ImageResources.ADD_CHART_UI_EVENT;
+                                       } else if (strItemName.equalsIgnoreCase("file")) {
+                                               itemImage = ImageResources.ADD_CHART_READ_WRITE;
+                                       } else if (strItemName.equalsIgnoreCase("cpu frequency")) {
+                                               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.setForeground(ColorResources.BLACK);
+                                               event.gc.drawText(itemExplan, event.x + 20, event.y
+                                                               + offset2 + 35, true);
+                                       }
+                                       break;
                                }
-                               else if (strItemName.equalsIgnoreCase("file")){
-                                       itemImage = ImageResources.ADD_CHART_READ_WRITE;
+                               case SWT.EraseItem: {
+                                       event.detail &= ~SWT.FOREGROUND;
+                                       break;
                                }
-                               else if (strItemName.equalsIgnoreCase("cpu frequency")){
-                                       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.setForeground(ColorResources.BLACK);
-                           event.gc.drawText(itemExplan, event.x+20, event.y + offset2+35, true);
-                       }
-                   break;
-                 }
-                 case SWT.EraseItem: {
-                   event.detail &= ~SWT.FOREGROUND;
-                   break;
-                 }
-                 }
-               }        
-             };
-             chartTableViewer.getTable().addListener(SWT.MeasureItem, paintListener);
-             chartTableViewer.getTable().addListener(SWT.PaintItem, paintListener);
-             chartTableViewer.getTable().addListener(SWT.EraseItem, paintListener);
-             
-             
-             chartTableViewer.getTable().addMouseListener(itemZoomMouseListener);
-             
+                       }
+               };
+               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) {
@@ -281,12 +294,13 @@ public class TimelineEditItemsDialog extends Dialog {
                                        buff.append(selection[i].getText());
                                }
                                event.data = buff.toString();
-                               
+
                                chartChangeSatus = false;
                        }
                });
 
-               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) {
@@ -294,7 +308,8 @@ 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(
@@ -310,48 +325,49 @@ 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);
-                                 TableItem tblItemTarget = table.getItem(point);
-                  if (tblItemTarget == null) {
-                          return;
-                  }
+                               Point point = shell.getDisplay().map(null, table, event.x,
+                                               event.y);
+                               TableItem tblItemTarget = table.getItem(point);
+                               if (tblItemTarget == null) {
+                                       return;
+                               }
 
-                  ItemIndexB = table.indexOf(tblItemTarget);
+                               ItemIndexB = table.indexOf(tblItemTarget);
 
-                  if ( ItemDragOverIndex != ItemIndexB )
-                  {      
-                         TableItem[] chartTableItems = chartTableViewer.getTable().getItems();
+                               if (ItemDragOverIndex != ItemIndexB) {
+                                       TableItem[] chartTableItems = chartTableViewer.getTable()
+                                                       .getItems();
 
-                      String strIndexA = null;
-                      String strIndexB = null;
+                                       String strIndexA = null;
+                                       String strIndexB = null;
 
-                      strIndexA = chartTableItems[ItemIndexA].getText(2);
-                      strIndexB = chartTableItems[ItemIndexB].getText(2);
+                                       strIndexA = chartTableItems[ItemIndexA].getText(2);
+                                       strIndexB = chartTableItems[ItemIndexB].getText(2);
 
-                      chartTableItems[ItemIndexB].setText(2, strIndexA );
-                      chartTableItems[ItemIndexA].setText(2, strIndexB );
+                                       chartTableItems[ItemIndexB].setText(2, strIndexA);
+                                       chartTableItems[ItemIndexA].setText(2, strIndexB);
 
+                                       strIndexA = chartTableItems[ItemIndexB].getText(3);
+                                       strIndexB = chartTableItems[ItemIndexA].getText(3);
 
-                      strIndexA = chartTableItems[ItemIndexB].getText(3);
-                      strIndexB = chartTableItems[ItemIndexA].getText(3);
+                                       chartTableItems[ItemIndexA].setText(3, strIndexA);
+                                       chartTableItems[ItemIndexB].setText(3, strIndexB);
 
-                      chartTableItems[ItemIndexA].setText(3, strIndexA );
-                      chartTableItems[ItemIndexB].setText(3, strIndexB );
+                                       chartTableViewer.getTable().setDragDetect(true);
+                                       chartTableViewer.getTable().redraw();
 
-                      chartTableViewer.getTable().setDragDetect(true);
-                      chartTableViewer.getTable().redraw();
-                      
-                      int tempIndex = 0;
-                      tempIndex  = ItemIndexA;
-                      ItemIndexA = ItemIndexB;
-                      ItemIndexB = tempIndex;
-                  }
-                  ItemDragOverIndex = ItemIndexB;
+                                       int tempIndex = 0;
+                                       tempIndex = ItemIndexA;
+                                       ItemIndexA = ItemIndexB;
+                                       ItemIndexB = tempIndex;
+                               }
+                               ItemDragOverIndex = ItemIndexB;
                        }
 
                        public void drop(DropTargetEvent event) {
 
-                               if (TextTransfer.getInstance().isSupportedType(event.currentDataType)) {
+                               if (TextTransfer.getInstance().isSupportedType(
+                                               event.currentDataType)) {
 
                                }
                        }
@@ -365,16 +381,17 @@ public class TimelineEditItemsDialog extends Dialog {
                buttonComp.setLayoutData(bcgd);
                bcgd.horizontalAlignment = GridData.CENTER;
 
-               Button okButton = new Button(buttonComp, SWT.PUSH);
-               okButton.addListener(SWT.Selection, okButtonListener);
+               DAButton okButton = new DAButton(buttonComp, SWT.PUSH);
+               okButton.addClickListener(okButtonListener);
                okButton.setText("OK"); //$NON-NLS-1$
                GridData bgd = new GridData();
                bgd.widthHint = 100;
                bgd.heightHint = 40;
                okButton.setLayoutData(bgd);
 
-               Button cancelButton = new Button(buttonComp, SWT.PUSH);
-               cancelButton.addListener(SWT.Selection, cancelButtonListener);
+               DAButton cancelButton = new DAButton(buttonComp, SWT.PUSH);
+               // cancelButton.addListener(SWT.Selection, cancelButtonListener);
+               cancelButton.addClickListener(cancelButtonListener);
                cancelButton.setText("CANCEL"); //$NON-NLS-1$
                GridData cbgd = new GridData();
                cbgd.widthHint = 100;
@@ -382,27 +399,32 @@ public class TimelineEditItemsDialog extends Dialog {
                cancelButton.setLayoutData(cbgd);
 
                shell.open();
-       
+
                return 0;
        }
-       
-    private MouseListener itemZoomMouseListener = new MouseAdapter() {
-        public void mouseUp(MouseEvent event) {
-                       if (chartChangeSatus == true ) {
+
+       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();
                        }
                        chartChangeSatus = true;
-                       
-           }
-    };
+
+               }
+       };
 
 }
\ No newline at end of file
index 507bf88..6559a64 100644 (file)
@@ -2,6 +2,7 @@ package org.tizen.dynamicanalyzer.ui.widgets;
 
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.ColorResources;
+import org.tizen.dynamicanalyzer.FontResources;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 
 public class DAButton extends DACustomButton {
@@ -24,5 +25,6 @@ public class DAButton extends DACustomButton {
                                ColorResources.BUTTON_OUTLINE_PUSH_COLOR,
                                ColorResources.BUTTON_OUTLINE_HOVER_COLOR,
                                ColorResources.BUTTON_OUTLINE_DISABLE_COLOR);
+               setFont(FontResources.DIALOG_BUTTON_FONT);
        }
 }