[Title] DACustomButton fixed
authorjy.exe.lee <jy.exe.lee@samsung.com>
Thu, 5 Jul 2012 05:20:55 +0000 (14:20 +0900)
committerjy.exe.lee <jy.exe.lee@samsung.com>
Thu, 5 Jul 2012 05:20:55 +0000 (14:20 +0900)
[Type] bug fix
[Module] DynamicAnalyzer
[Priority] normal
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

23 files changed:
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButton.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/TizenButton.java with 89% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButtonClickEventListener.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/TizenButtonClickEventListener.java with 63% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButtonDefaultRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/TizenDefaultButtonRenderer.java with 68% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButtonRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/TizenButtonRenderer.java with 80% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomWidgetAttribute.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/TizenWidgetAttribute.java with 92% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButton.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/TizenToggleButton.java with 79% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/TizenToggleButtonRenderer.java with 50% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/TizenCombo.java with 93% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboDefaultRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DefaultTizenComboRenderer.java with 82% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupDefaultRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DefaultTizenComboPopupRenderer.java with 94% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/TizenComboPopupRenderer.java with 92% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/TizenComboRenderer.java with 90% similarity]
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboSelectionListener.java [moved from org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/TizenComboSelectionListener.java with 64% similarity]
org.tizen.dynamicanalyzer.widgets/src/test/TestClass.java
org.tizen.dynamicanalyzer/lib/org.tizen.widget.jar [deleted file]
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/base/DAEffectFrame.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DATabComposite.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/combo/TitleComboPopupRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/combo/TitleComboRenderer.java

@@ -15,7 +15,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 
-public class TizenButton extends Canvas {
+public class DACustomButton extends Canvas {
        public static final int MAX_SIZE = 100;
 
        public static final int STATE_NORMAL = 0;
@@ -31,8 +31,8 @@ public class TizenButton extends Canvas {
        protected boolean enabled = true;
 
        protected int state = STATE_NORMAL;
-       protected TizenWidgetAttribute attr;
-       protected TizenDefaultButtonRenderer buttonRenderer = null;
+       protected DACustomWidgetAttribute attr;
+       protected DACustomButtonDefaultRenderer buttonRenderer = null;
 
        public void addListeners() {
                this.addListener(SWT.MouseEnter, buttonMouseListener);
@@ -41,7 +41,7 @@ public class TizenButton extends Canvas {
                this.addListener(SWT.MouseUp, buttonMouseListener);
        }
 
-       public TizenButton(Composite parent, int style) {
+       public DACustomButton(Composite parent, int style) {
                super(parent, style);
 
                this.parent = parent;
@@ -51,17 +51,17 @@ public class TizenButton extends Canvas {
                this.setForeground(ColorResources.WHITE);
                this.addPaintListener(buttonPaintListener);
                addListeners();
-               buttonRenderer = new TizenButtonRenderer();
-               attr = new TizenWidgetAttribute();
+               buttonRenderer = new DACustomButtonRenderer();
+               attr = new DACustomWidgetAttribute();
                setDefaultColors();
        }
 
-       public TizenButton(Composite parent, int style, String titleText) {
+       public DACustomButton(Composite parent, int style, String titleText) {
                this(parent, style);
                attr.setTitle(titleText);
        }
 
-       public TizenButton(Composite parent, Image normal, Image mouseDown,
+       public DACustomButton(Composite parent, Image normal, Image mouseDown,
                        Image hover, Image disable) {
                this(parent, SWT.TRANSPARENT);
                setImages(normal, mouseDown, hover, disable);
@@ -123,7 +123,7 @@ public class TizenButton extends Canvas {
                attr.setTitle(newTitle);
        }
 
-       public void setRenderer(TizenDefaultButtonRenderer newRenderer) {
+       public void setRenderer(DACustomButtonDefaultRenderer newRenderer) {
                buttonRenderer = newRenderer;
        }
 
@@ -207,7 +207,7 @@ public class TizenButton extends Canvas {
                attr.setImage(STATE_DISABLE, disable);
        }
 
-       public void addClickListener(TizenButtonClickEventListener listener) {
+       public void addClickListener(DACustomButtonClickEventListener listener) {
                addListener(SWT.MouseUp, listener);
        }
 }
@@ -4,11 +4,11 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Event;\r
 import org.eclipse.swt.widgets.Listener;\r
 \r
-public abstract class TizenButtonClickEventListener implements Listener {\r
+public abstract class DACustomButtonClickEventListener implements Listener {\r
 \r
        @Override\r
        public void handleEvent(Event event) {\r
-               TizenButton button = (TizenButton) event.widget;\r
+               DACustomButton button = (DACustomButton) event.widget;\r
                if (null != button) {\r
                        Rectangle rectangle = button.getBounds();\r
                        int x = event.x;\r
@@ -19,8 +19,8 @@ public abstract class TizenButtonClickEventListener implements Listener {
                        }\r
                }\r
 \r
-               handleClickEvent(event);\r
+               handleClickEvent(button);\r
        }\r
 \r
-       public abstract void handleClickEvent(Event event);\r
+       public abstract void handleClickEvent(DACustomButton button);\r
 }\r
@@ -3,8 +3,8 @@ package org.tizen.dynamicanalyzer.widgets.button;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.widgets.Canvas;
 
-public abstract class TizenDefaultButtonRenderer {
+public abstract class DACustomButtonDefaultRenderer {
        public abstract void draw(GC gc, Canvas canvas, int state,
-                       TizenWidgetAttribute attr);
+                       DACustomWidgetAttribute attr);
 
 }
@@ -11,13 +11,13 @@ import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 
-public class TizenButtonRenderer extends TizenDefaultButtonRenderer {
+public class DACustomButtonRenderer extends DACustomButtonDefaultRenderer {
 
        @Override
-       public void draw(GC gc, Canvas canvas, int state, TizenWidgetAttribute attr) {
+       public void draw(GC gc, Canvas canvas, int state, DACustomWidgetAttribute attr) {
                Rectangle rect = canvas.getClientArea();
 
-               if (attr.getDrawType() == TizenButton.TYPE_IMAGE) {
+               if (attr.getDrawType() == DACustomButton.TYPE_IMAGE) {
                        Image image = attr.getImage(state);
                        if (null == image) {
                                return;
@@ -25,10 +25,10 @@ public class TizenButtonRenderer extends TizenDefaultButtonRenderer {
 
                        gc.drawImage(image, rect.x, rect.y);
                        drawButtonText(gc, rect, attr);
-               } else if (attr.getDrawType() == TizenButton.TYPE_COLOR) {
+               } else if (attr.getDrawType() == DACustomButton.TYPE_COLOR) {
                        Color color = attr.getColor(state);
                        drawButton(gc, rect, color, attr);
-               } else if (attr.getDrawType() == TizenButton.TYPE_GRADATION) {
+               } else if (attr.getDrawType() == DACustomButton.TYPE_GRADATION) {
                        // TODO: implement..
                }
        }
@@ -41,7 +41,7 @@ public class TizenButtonRenderer extends TizenDefaultButtonRenderer {
        }
 
        public void drawButton(GC gc, Rectangle rect, Color c,
-                       TizenWidgetAttribute attr) {
+                       DACustomWidgetAttribute attr) {
                gc.setBackground(c);
                gc.fillRectangle(rect);
                Rectangle r = new Rectangle(0, 0, rect.width - 1, rect.height - 1);
@@ -52,7 +52,7 @@ public class TizenButtonRenderer extends TizenDefaultButtonRenderer {
                gc.setForeground(c);
        }
 
-       protected void drawButtonText(GC gc, Rectangle rect, TizenWidgetAttribute attr) {
+       protected void drawButtonText(GC gc, Rectangle rect, DACustomWidgetAttribute attr) {
                String s = null;
                Font f = null;
                Point p = null;
@@ -8,18 +8,18 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 
-public class TizenWidgetAttribute {
+public class DACustomWidgetAttribute {
        private final int MAX_SIZE = 10;
        private String title;
        private Font font;
        private Point fontPoint;
-       private int drawType = TizenButton.TYPE_COLOR;
+       private int drawType = DACustomButton.TYPE_COLOR;
 
        private List<Image> images = new ArrayList<Image>();
        private List<Color> colors = new ArrayList<Color>();
        private boolean enabled;
 
-       public TizenWidgetAttribute() {
+       public DACustomWidgetAttribute() {
                enabled = true;
                
                // init array
@@ -5,26 +5,26 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Event;\r
 import org.eclipse.swt.widgets.Listener;\r
-import org.tizen.dynamicanalyzer.widgets.button.TizenButton;\r
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;\r
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;\r
 \r
-public class TizenToggleButton extends TizenButton {\r
+public class DACustomToggleButton extends DACustomButton {\r
 \r
        public static final int STATE_TOGGLE = 4;\r
        private boolean toggle = false;\r
 \r
-       public TizenToggleButton(Composite parent, Image normal, Image mouseDown,\r
+       public DACustomToggleButton(Composite parent, Image normal, Image mouseDown,\r
                        Image hover, Image disable, Image toggle) {\r
                super(parent, normal, mouseDown, hover, disable);\r
-               buttonRenderer = new TizenToggleButtonRenderer();\r
+               buttonRenderer = new DACustomToggleButtonRenderer();\r
 \r
                attr.setImage(STATE_TOGGLE, toggle);\r
                addListeners();\r
        }\r
 \r
-       public TizenToggleButton(Composite parent, int style) {\r
+       public DACustomToggleButton(Composite parent, int style) {\r
                super(parent, style);\r
-               buttonRenderer = new TizenToggleButtonRenderer();\r
+               buttonRenderer = new DACustomToggleButtonRenderer();\r
                attr.setColor(STATE_TOGGLE, ColorResources.BLUE);\r
                addListeners();\r
        }\r
@@ -5,16 +5,16 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButton;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButtonRenderer;
-import org.tizen.dynamicanalyzer.widgets.button.TizenWidgetAttribute;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomWidgetAttribute;
 
-public class TizenToggleButtonRenderer extends TizenButtonRenderer {
+public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 
        @Override
-       public void draw(GC gc, Canvas canvas, int state, TizenWidgetAttribute attr) {
+       public void draw(GC gc, Canvas canvas, int state, DACustomWidgetAttribute attr) {
                Rectangle rect = canvas.getClientArea();
-               if (attr.getDrawType() == TizenButton.TYPE_IMAGE) {
+               if (attr.getDrawType() == DACustomButton.TYPE_IMAGE) {
                        Image image = attr.getImage(state);
                        if (null == image) {
                                return;
@@ -22,10 +22,10 @@ public class TizenToggleButtonRenderer extends TizenButtonRenderer {
 
                        gc.drawImage(image, rect.x, rect.y);
                        drawButtonText(gc, rect, attr);
-               } else if (attr.getDrawType() == TizenButton.TYPE_COLOR) {
+               } else if (attr.getDrawType() == DACustomButton.TYPE_COLOR) {
                        Color color = attr.getColor(state);
                        drawButton(gc, rect, color, attr);
-               } else if (attr.getDrawType() == TizenButton.TYPE_GRADATION) {
+               } else if (attr.getDrawType() == DACustomButton.TYPE_GRADATION) {
                        // TODO: implement..
                }
        }
@@ -20,10 +20,10 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 
-public class TizenCombo extends Canvas {
+public class DACustomCombo extends Canvas {
        public static final int MAX_SIZE = 10;
        public static final int STATE_NORMAL = 0;
        public static final int STATE_HOVER = 1;
@@ -36,8 +36,8 @@ public class TizenCombo extends Canvas {
        private Canvas combo = null;
        private Canvas popup = null;
        private int itemHeight = 0;
-       private TizenButton upArrowButton = null;
-       private TizenButton downArrowButton = null;
+       private DACustomButton upArrowButton = null;
+       private DACustomButton downArrowButton = null;
        private int itemIndex = 0;
 
        private List<String> items;
@@ -50,10 +50,10 @@ public class TizenCombo extends Canvas {
        private String text = ""; //$NON-NLS-1$
        private boolean imgCombo = false;
        private int state = STATE_NORMAL; // 0 normal 1 hover 2 push 3 disable
-       private TizenComboRenderer comboRenderer = new DefaultTizenComboRenderer();;
-       private TizenComboPopupRenderer popupRenderer = new DefaultTizenComboPopupRenderer();
+       private DACustomComboRenderer comboRenderer = new DACustomComboDefaultRenderer();;
+       private DACustomComboPopupRenderer popupRenderer = new DACustomComboPopupDefaultRenderer();
 
-       public TizenCombo(Composite parent, int style) {
+       public DACustomCombo(Composite parent, int style) {
                super(parent, style);
                combo = this;
 
@@ -98,15 +98,15 @@ public class TizenCombo extends Canvas {
                redraw();
        }
 
-       private Listener popupSelectionListener = new TizenComboSelectionListener() {
+       private Listener popupSelectionListener = new DACustomComboSelectionListener() {
 
                @Override
-               public void selectionEvent(TizenCombo combo) {
+               public void selectionEvent(DACustomCombo combo) {
                        System.out.println("default selection" + combo.getText());
                }
        };
 
-       public void addSelectionListener(TizenComboSelectionListener listener) {
+       public void addSelectionListener(DACustomComboSelectionListener listener) {
                popupSelectionListener = listener;
        }
 
@@ -232,7 +232,7 @@ public class TizenCombo extends Canvas {
                popup.addListener(SWT.MouseWheel, popupMouseEventListener);
 
                if (size > MAX_SIZE) {
-                       upArrowButton = new TizenButton(childShell, SWT.NONE);
+                       upArrowButton = new DACustomButton(childShell, SWT.NONE);
                        upArrowButton.setText("up"); //$NON-NLS-1$
                        FormData data = new FormData();
                        data.top = new FormAttachment(0, 0);
@@ -252,7 +252,7 @@ public class TizenCombo extends Canvas {
                        data.height = height * boundSize + 5 - 2;
                        popup.setLayoutData(data);
 
-                       downArrowButton = new TizenButton(childShell, SWT.NONE);
+                       downArrowButton = new DACustomButton(childShell, SWT.NONE);
                        downArrowButton.setText("down"); //$NON-NLS-1$
                        data = new FormData();
                        data.top = new FormAttachment(popup, 0);
@@ -513,11 +513,11 @@ public class TizenCombo extends Canvas {
                }
        };
 
-       public void setComboRender(TizenComboRenderer newRenderer) {
+       public void setComboRender(DACustomComboRenderer newRenderer) {
                comboRenderer = newRenderer;
        }
 
-       public void setComboPopupRender(TizenComboPopupRenderer newRenderer) {
+       public void setComboPopupRender(DACustomComboPopupRenderer newRenderer) {
                popupRenderer = newRenderer;
        }
 
@@ -9,18 +9,18 @@ import org.eclipse.swt.widgets.Canvas;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 
 
-public class DefaultTizenComboRenderer extends TizenComboRenderer {
+public class DACustomComboDefaultRenderer extends DACustomComboRenderer {
 
        @Override
        public void draw(GC gc, Canvas canvas, String text, int state) {
                Rectangle rect = canvas.getClientArea();
-               if (state == TizenCombo.STATE_NORMAL) {
+               if (state == DACustomCombo.STATE_NORMAL) {
                        gc.setBackground(ColorResources.WINDOW_BG_COLOR);
-               } else if (state == TizenCombo.STATE_HOVER) {
+               } else if (state == DACustomCombo.STATE_HOVER) {
                        gc.setBackground(ColorResources.ITEM_BLUE_DARK);
-               } else if (state == TizenCombo.STATE_PUSH) {
+               } else if (state == DACustomCombo.STATE_PUSH) {
                        gc.setBackground(ColorResources.BLUE);
-               } else if (state == TizenCombo.STATE_DISABLE) {
+               } else if (state == DACustomCombo.STATE_DISABLE) {
                        gc.setBackground(ColorResources.BAR_GRAY1);
                }
                gc.fillRectangle(rect);
@@ -11,7 +11,7 @@ import org.eclipse.swt.widgets.Canvas;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 
 
-public class DefaultTizenComboPopupRenderer extends TizenComboPopupRenderer {
+public class DACustomComboPopupDefaultRenderer extends DACustomComboPopupRenderer {
 
        @Override
        public void draw(GC gc, Canvas canvas, int state, List<Rectangle> rects,
@@ -7,7 +7,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 
-public abstract class TizenComboPopupRenderer {
+public abstract class DACustomComboPopupRenderer {
        public abstract void draw(GC gc, Canvas canvas, int state,
                        List<Rectangle> rects, int selection, List<String> items);
 
@@ -4,7 +4,7 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Canvas;
 
-public abstract class TizenComboRenderer {
+public abstract class DACustomComboRenderer {
        public abstract void draw(GC gc, Canvas canvas, String text, int state);
        public abstract void drawPattern(GC gc, Canvas canvas, Image patternImage, String text,  int state);
        public abstract void drawImage(GC gc, Canvas canvas, Image image, String text,  int state);
@@ -4,17 +4,17 @@ import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 
-public abstract class TizenComboSelectionListener implements Listener {
+public abstract class DACustomComboSelectionListener implements Listener {
 
        @Override
        public void handleEvent(Event event) {
                Canvas popup = (Canvas) event.widget;
-               TizenCombo combo = (TizenCombo) popup.getData();
+               DACustomCombo combo = (DACustomCombo) popup.getData();
                if (null != combo) {
                        selectionEvent(combo);
                        combo.upEvent();
                }
        }
 
-       public abstract void selectionEvent(TizenCombo combo);
+       public abstract void selectionEvent(DACustomCombo combo);
 }
index 1207ed1..f38848d 100644 (file)
@@ -6,13 +6,12 @@ import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Shell;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButton;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButtonClickEventListener;
-import org.tizen.dynamicanalyzer.widgets.button.toggle.TizenToggleButton;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenCombo;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenComboSelectionListener;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
+import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboSelectionListener;
 import org.tizen.dynamicanalyzer.widgets.graph.circular.CircularGraph;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
 import org.tizen.dynamicanalyzer.widgets.helper.ImageResources;
@@ -26,7 +25,7 @@ public class TestClass {
 
                shell.setLayout(new FormLayout());
                shell.open();
-               TizenButton button = new TizenButton(shell, SWT.NONE);
+               DACustomButton button = new DACustomButton(shell, SWT.NONE);
                button.setText("test");
                FormData data = new FormData();
                data.top = new FormAttachment(5, 0);
@@ -35,15 +34,15 @@ public class TestClass {
                data.height = 50;
                button.setLayoutData(data);
 
-               button.addClickListener(new TizenButtonClickEventListener() {
+               button.addClickListener(new DACustomButtonClickEventListener() {
 
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                System.out.println("button test");
                        }
                });
 
-               TizenButton imgButton = new TizenButton(shell, ImageResources.ABOUT,
+               DACustomButton imgButton = new DACustomButton(shell, ImageResources.ABOUT,
                                ImageResources.ABOUT_PUSH, ImageResources.ABOUT_HOVER,
                                ImageResources.ABOUT_DISABLE);
                imgButton.setText("test2");
@@ -54,7 +53,7 @@ public class TestClass {
                data.height = 50;
                imgButton.setLayoutData(data);
 
-               TizenToggleButton toggle = new TizenToggleButton(shell, SWT.NONE);
+               DACustomToggleButton toggle = new DACustomToggleButton(shell, SWT.NONE);
                toggle.setText("toggle");
                data = new FormData();
                data.top = new FormAttachment(imgButton, 10);
@@ -63,7 +62,7 @@ public class TestClass {
                data.height = 50;
                toggle.setLayoutData(data);
 
-               TizenToggleButton imgToggle = new TizenToggleButton(shell,
+               DACustomToggleButton imgToggle = new DACustomToggleButton(shell,
                                ImageResources.VIEW_SOURCE, ImageResources.VIEW_SOURCE_PUSH,
                                ImageResources.VIEW_SOURCE_HOVER,
                                ImageResources.VIEW_SOURCE_DISABLE,
@@ -76,7 +75,7 @@ public class TestClass {
                data.height = 50;
                imgToggle.setLayoutData(data);
 
-               TizenCombo combo = new TizenCombo(shell, SWT.NONE);
+               DACustomCombo combo = new DACustomCombo(shell, SWT.NONE);
                for (int i = 0; i < 29; i++) {
                        combo.add("test " + i);
                }
@@ -100,9 +99,9 @@ public class TestClass {
                circle.setTextColor(ColorResources.BLACK);
                circle.setText("circlular graph test");
 
-               TizenComboSelectionListener comboSelectionListener = new TizenComboSelectionListener() {
+               DACustomComboSelectionListener comboSelectionListener = new DACustomComboSelectionListener() {
                        @Override
-                       public void selectionEvent(TizenCombo combo) {
+                       public void selectionEvent(DACustomCombo combo) {
                                System.out.println("combo selected :" + combo.getText());
                        }
                };
diff --git a/org.tizen.dynamicanalyzer/lib/org.tizen.widget.jar b/org.tizen.dynamicanalyzer/lib/org.tizen.widget.jar
deleted file mode 100644 (file)
index 1733ac9..0000000
Binary files a/org.tizen.dynamicanalyzer/lib/org.tizen.widget.jar and /dev/null differ
index a5fcd84..5539d02 100755 (executable)
@@ -76,8 +76,8 @@ public class TableTooltipListener implements Listener {
                                if (SWT.CTRL == event.keyCode) {\r
                                        grid.setCursor(sourceCursor);\r
 \r
-                                       CoolbarArea.getInstance().setSourceViewButtonToggleState(\r
-                                                       true);\r
+//                                     CoolbarArea.getInstance().setSourceViewButtonToggleState(\r
+//                                                     true);\r
                                }\r
                        }\r
                        break;\r
@@ -86,8 +86,8 @@ public class TableTooltipListener implements Listener {
                                if (SWT.CTRL == event.keyCode) {\r
                                        grid.setCursor(defaultCursor);\r
 \r
-                                       CoolbarArea.getInstance().setSourceViewButtonToggleState(\r
-                                                       false);\r
+//                                     CoolbarArea.getInstance().setSourceViewButtonToggleState(\r
+//                                                     false);\r
                                }\r
 \r
                                disposeTooltip();\r
index 3a20002..ec59fa7 100755 (executable)
@@ -40,7 +40,6 @@ import org.tizen.dynamicanalyzer.constants.DesignConstants;
 import org.tizen.dynamicanalyzer.handlers.ReplayTraceHandler;
 import org.tizen.dynamicanalyzer.handlers.SaveTraceHandler;
 import org.tizen.dynamicanalyzer.handlers.StartStopTraceHandler;
-import org.tizen.dynamicanalyzer.listeners.DAButtonClickEventListener;
 import org.tizen.dynamicanalyzer.model.AppDesktopInfo;
 import org.tizen.dynamicanalyzer.model.Project;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
@@ -52,14 +51,14 @@ import org.tizen.dynamicanalyzer.ui.widgets.ConfigurationDialog;
 import org.tizen.dynamicanalyzer.ui.widgets.OpenTraceDialog;
 import org.tizen.dynamicanalyzer.ui.widgets.TimerClock;
 import org.tizen.dynamicanalyzer.ui.widgets.button.DAButton;
-import org.tizen.dynamicanalyzer.ui.widgets.button.DAToggleButton;
 import org.tizen.dynamicanalyzer.ui.widgets.combo.TitleComboPopupRenderer;
 import org.tizen.dynamicanalyzer.ui.widgets.combo.TitleComboRenderer;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButton;
-import org.tizen.dynamicanalyzer.widgets.button.TizenButtonClickEventListener;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenCombo;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenComboSelectionListener;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
+import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboSelectionListener;
 
 public class CoolbarArea {
 
@@ -106,27 +105,27 @@ public class CoolbarArea {
        // Title bar
        private Composite titlebarComposite;
        private Label titleLabel;
-       private TizenButton minButton;
-       private TizenButton maxButton;
-       private TizenButton closeButton;
+       private DACustomButton minButton;
+       private DACustomButton maxButton;
+       private DACustomButton closeButton;
 
        // Toolbar
        private Composite toolbarComposite;
-       private TizenCombo deviceCombo;
-       private TizenCombo appCombo;
+       private DACustomCombo deviceCombo;
+       private DACustomCombo appCombo;
 
        private Composite controlComposite;
-       private DAButton startButton;
+       private DACustomButton startButton;
        private Composite timerComposite;
        private TimerClock timerClock;
-       private DAButton saveTraceButton;
-       private DAButton openTraceButton;
-       private DAButton replayButton;
-       private DAButton settingsButton;
-       private DAButton aboutButton;
-       private DAToggleButton viewSourceButton;
+       private DACustomButton saveTraceButton;
+       private DACustomButton openTraceButton;
+       private DACustomButton replayButton;
+       private DACustomButton settingsButton;
+       private DACustomButton aboutButton;
+       private DACustomToggleButton viewSourceButton;
 
-       private List<DAButton> pageTab = null;
+       private List<DACustomButton> pageTab = null;
 
        private static final int TAB_MAIN = 0;
        private static final int TAB_ANALYSIS = 1;
@@ -244,8 +243,6 @@ public class CoolbarArea {
 
        private static int COMBO_FIRST_INDEX = 0;
 
-       private boolean sourceViewToggleState = false;
-
        public static boolean bThreadPageWork = false; // FIXME
 
        private Listener titlebarListener = new Listener() {
@@ -658,27 +655,27 @@ public class CoolbarArea {
        }
 
        private void addTitlebarListeners() {
-               minButton.addClickListener(new TizenButtonClickEventListener() {
+               minButton.addClickListener(new DACustomButtonClickEventListener() {
 
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                shell.setMinimized(true);
                        }
                });
 
-               maxButton.addClickListener(new TizenButtonClickEventListener() {
+               maxButton.addClickListener(new DACustomButtonClickEventListener() {
 
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                handleMaximization();
                        }
 
                });
 
-               closeButton.addClickListener(new TizenButtonClickEventListener() {
+               closeButton.addClickListener(new DACustomButtonClickEventListener() {
 
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                PlatformUI.getWorkbench().close();
                        }
                });
@@ -703,10 +700,10 @@ public class CoolbarArea {
        }
 
        private void addToolbarListeners() {
-               deviceCombo.addSelectionListener(new TizenComboSelectionListener() {
+               deviceCombo.addSelectionListener(new DACustomComboSelectionListener() {
 
                        @Override
-                       public void selectionEvent(TizenCombo combo) {
+                       public void selectionEvent(DACustomCombo combo) {
                                String serial = combo.getText();
                                DACommunicator.setSelectedDeviceBySerial(serial);
                                setSelectedDevice(serial);
@@ -716,10 +713,10 @@ public class CoolbarArea {
                        }
                });
 
-               appCombo.addSelectionListener(new TizenComboSelectionListener() {
+               appCombo.addSelectionListener(new DACustomComboSelectionListener() {
 
                        @Override
-                       public void selectionEvent(TizenCombo combo) {
+                       public void selectionEvent(DACustomCombo combo) {
                                String appName = combo.getText();
                                if (null != appName && !appName.isEmpty()) {
                                        AppDesktopInfo selectedApp = DACommunicator
@@ -741,15 +738,16 @@ public class CoolbarArea {
                });
 
                startButton
-                               .addClickListener(new DAButtonClickEventListener(startButton) {
+                               .addClickListener(new DACustomButtonClickEventListener() {
+
                                        @Override
-                                       public void handleClickEvent(Event event) {
+                                       public void handleClickEvent(DACustomButton button) {
                                                String state = AnalyzerUtil.getRecordState();
                                                if (state
                                                                .equals(RecordStateSourceProvider.RECORD_READY)) {
                                                        AnalyzerUtil
                                                                        .setRecordState(RecordStateSourceProvider.RECORD_RECORDING);
-                                                       startButton.setImage(stopHoverImage);
+                                                       button.setHoverImage(stopHoverImage);
                                                        setStartToolbarState(true);
                                                        // timerClock.start();
                                                        setToolbarEnablement(false);
@@ -757,52 +755,57 @@ public class CoolbarArea {
                                                } else {
                                                        AnalyzerUtil
                                                                        .setRecordState(RecordStateSourceProvider.RECORD_READY);
-                                                       startButton.setImage(startHoverImage);
+                                                       button.setHoverImage(startHoverImage);
                                                        setStartToolbarState(false);
                                                        // timerClock.stop();
                                                        setToolbarEnablement(true);
                                                        StateManager.getInstance().StopProcessStart(
                                                                        "stop button pressed");
                                                }
-                                               startButton.setEnabled(false);
+                                               button.setEnabled(false);
                                                AnalyzerUtil.executeCommand(StartStopTraceHandler.ID);
                                        }
                                });
 
-               saveTraceButton.addClickListener(new DAButtonClickEventListener(
-                               saveTraceButton) {
-                       @Override
-                       public void handleClickEvent(Event event) {
-                               int result = AnalyzerUtil.executeCommand(SaveTraceHandler.ID);
-                               if (AnalyzerConstants.SUCCESS == result) {
-                                       saveTraceButton.setEnabled(false);
-                               }
-                       }
-               });
+               saveTraceButton
+                               .addClickListener(new DACustomButtonClickEventListener() {
 
-               openTraceButton.addClickListener(new DAButtonClickEventListener(
-                               openTraceButton) {
-                       @Override
-                       public void handleClickEvent(Event event) {
-                               Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell();
-                               OpenTraceDialog dialog = new OpenTraceDialog(shell, SWT.NONE);
-                               dialog.open();
-                               System.out.println("open trace"); //$NON-NLS-1$
-                               openTraceButton.setEnabled(false);
-                               openTraceButton.setEnabled(true);
-                       }
-               });
+                                       @Override
+                                       public void handleClickEvent(DACustomButton button) {
+                                               int result = AnalyzerUtil
+                                                               .executeCommand(SaveTraceHandler.ID);
+                                               if (AnalyzerConstants.SUCCESS == result) {
+                                                       button.setEnabled(false);
+                                               }
+                                       }
+                               });
+
+               openTraceButton
+                               .addClickListener(new DACustomButtonClickEventListener() {
+
+                                       @Override
+                                       public void handleClickEvent(DACustomButton button) {
+                                               Shell shell = AnalyzerUtil.getWorkbenchWindow()
+                                                               .getShell();
+                                               OpenTraceDialog dialog = new OpenTraceDialog(shell,
+                                                               SWT.NONE);
+                                               dialog.open();
+                                               System.out.println("open trace"); //$NON-NLS-1$
+                                               button.setEnabled(false);
+                                               button.setEnabled(true);
+                                       }
+                               });
+
+               replayButton.addClickListener(new DACustomButtonClickEventListener() {
 
-               replayButton.addClickListener(new DAButtonClickEventListener(
-                               replayButton) {
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                String state = AnalyzerUtil.getRecordState();
                                if (state.equals(RecordStateSourceProvider.RECORD_READY)) {
                                        if (AnalyzerUtil.executeCommand(ReplayTraceHandler.ID) != ReplayTraceHandler.FAILED) {
                                                AnalyzerUtil
                                                                .setRecordState(RecordStateSourceProvider.RECORD_RECORDING);
-                                               startButton.setImage(stopImage);
+                                               startButton.setNormalImage(stopImage);
                                                startButton.setToolTipText(AnalyzerLabels.STOP_TRACE);
                                                setStartToolbarState(true);
                                                timerClock.start();
@@ -813,10 +816,10 @@ public class CoolbarArea {
                        }
                });
 
-               settingsButton.addClickListener(new DAButtonClickEventListener(
-                               settingsButton) {
+               settingsButton.addClickListener(new DACustomButtonClickEventListener() {
+
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell();
                                ConfigurationDialog dialog = new ConfigurationDialog(shell,
                                                SWT.NONE); // FIXME
@@ -824,34 +827,37 @@ public class CoolbarArea {
                        }
                });
 
-               aboutButton
-                               .addClickListener(new DAButtonClickEventListener(aboutButton) {
-                                       @Override
-                                       public void handleClickEvent(Event event) {
-                                               Shell shell = AnalyzerUtil.getWorkbenchWindow()
-                                                               .getShell();
-                                               AboutDialog dialog = new AboutDialog(shell, SWT.NONE); // FIXME
-                                               dialog.open();
-                                       }
-                               });
+               aboutButton.addClickListener(new DACustomButtonClickEventListener() {
 
-               viewSourceButton.addClickListener(new DAButtonClickEventListener(
-                               viewSourceButton) {
                        @Override
-                       public void handleClickEvent(Event event) {
-                               sourceViewToggleState = !sourceViewToggleState;
-                               viewSourceButton.setToggled(sourceViewToggleState);
-
-                               AnalyzerManager.getCurrentPage().setSourceView(
-                                               sourceViewToggleState);
-                               if (!sourceViewToggleState) {
-                                       AnalyzerManager.setTheme(DAThemeBlack.getInstance());
-                               } else {
-                                       AnalyzerManager.setTheme(DAThemeTest.getInstance());
-                               }
+                       public void handleClickEvent(DACustomButton button) {
+                               Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell();
+                               AboutDialog dialog = new AboutDialog(shell, SWT.NONE); // FIXME
+                               dialog.open();
                        }
                });
 
+               viewSourceButton
+                               .addClickListener(new DACustomButtonClickEventListener() {
+                                       @Override
+                                       public void handleClickEvent(DACustomButton button) {
+                                               DACustomToggleButton toggle = (DACustomToggleButton)button;
+                                               
+//                                             sourceViewToggleState = !sourceViewToggleState;
+//                                             viewSourceButton.setToggled(sourceViewToggleState);
+
+                                               AnalyzerManager.getCurrentPage().setSourceView(
+                                                               toggle.isToggled());
+                                               
+                                               // theme test
+                                               if (toggle.isToggled()) {
+                                                       AnalyzerManager.setTheme(DAThemeBlack.getInstance());
+                                               } else {
+                                                       AnalyzerManager.setTheme(DAThemeTest.getInstance());
+                                               }
+                                       }
+                               });
+
                // tutorialButton.addListener(SWT.MouseDown, new Listener() {
                // @Override
                // public void handleEvent(Event event) {
@@ -956,17 +962,17 @@ public class CoolbarArea {
                buttonComposite.setBackground(titlebarColor);
 
                // Creates minimization button.
-               minButton = new TizenButton(buttonComposite, minImage, minPushImage,
+               minButton = new DACustomButton(buttonComposite, minImage, minPushImage,
                                minHoverImage, null);
                minButton.setToolTipText(AnalyzerLabels.MIN);
 
                // Creates maximization button.
-               maxButton = new TizenButton(buttonComposite, maxImage, maxPushImage,
+               maxButton = new DACustomButton(buttonComposite, maxImage, maxPushImage,
                                maxHoverImage, null);
                maxButton.setToolTipText(AnalyzerLabels.MAX);
 
                // Creates exit button.
-               closeButton = new TizenButton(buttonComposite, closeImage,
+               closeButton = new DACustomButton(buttonComposite, closeImage,
                                closePushImage, closeHoverImage, null);
                closeButton.setToolTipText(AnalyzerLabels.CLOSE);
 
@@ -1008,7 +1014,7 @@ public class CoolbarArea {
                controlComposite.setLayout(new FormLayout());
 
                // Creates start button.
-               startButton = new DAButton(controlComposite, startImage,
+               startButton = new DACustomButton(controlComposite, startImage,
                                startPushImage, startHoverImage, startDisableImage);
                startButton.setEnabled(false);
                startButton.setToolTipText(AnalyzerLabels.START_TRACE);
@@ -1018,18 +1024,18 @@ public class CoolbarArea {
                timerClock = new TimerClock(timerComposite);
 
                // // Creates save trace button.
-               saveTraceButton = new DAButton(controlComposite, saveImage,
+               saveTraceButton = new DACustomButton(controlComposite, saveImage,
                                savePushImage, saveHoverImage, saveDisableImage);
                saveTraceButton.setEnabled(false);
                saveTraceButton.setToolTipText(AnalyzerLabels.SAVE_TRACE);
 
                // // Creates open trace button.
-               openTraceButton = new DAButton(controlComposite, openImage,
+               openTraceButton = new DACustomButton(controlComposite, openImage,
                                openPushImage, openHoverImage, openDisableImage);
                openTraceButton.setToolTipText(AnalyzerLabels.OPEN_TRACE);
 
                // Creates replay button.
-               replayButton = new DAButton(controlComposite, replayImage,
+               replayButton = new DACustomButton(controlComposite, replayImage,
                                replayPushImage, replayHoverImage, replayDisableImage);
                replayButton.setToolTipText(AnalyzerLabels.REPLAY);
 
@@ -1038,19 +1044,19 @@ public class CoolbarArea {
                sourceViewComposite.setLayout(new FormLayout());
 
                // Creates about button.
-               settingsButton = new DAButton(sourceViewComposite, settingsImage,
+               settingsButton = new DACustomButton(sourceViewComposite, settingsImage,
                                settingsPushImage, settingsHoverImage, settingsDisableImage);
                settingsButton.setToolTipText(AnalyzerLabels.SETTING);
 
-               aboutButton = new DAButton(sourceViewComposite, aboutImage,
+               aboutButton = new DACustomButton(sourceViewComposite, aboutImage,
                                aboutPushImage, aboutHoverImage, aboutDisableImage);
                aboutButton.setToolTipText(AnalyzerLabels.ABOUT);
 
                // Creates pickaxe button.
-               viewSourceButton = new DAToggleButton(sourceViewComposite,
+               viewSourceButton = new DACustomToggleButton(sourceViewComposite,
                                viewSourceImage, viewSourcePushImage, viewSourceHoverImage,
                                viewSourceDisableImage, viewSourceToggleImage);
-               viewSourceButton.setImage(viewSourceImage);
+//             viewSourceButton.setImage(viewSourceImage);
                viewSourceButton.setToolTipText(AnalyzerLabels.VIEW_SOURCE);
 
                // tutorialButton = new Label(pickaxeComposite, SWT.NONE);
@@ -1127,7 +1133,7 @@ public class CoolbarArea {
 
                // device and application combo
                // Creates device combo.
-               deviceCombo = new TizenCombo(parent, SWT.NONE);
+               deviceCombo = new DACustomCombo(parent, SWT.NONE);
                deviceCombo.setImages(ImageResources.COMBO_NORMAL,
                                ImageResources.COMBO_HOVER, ImageResources.COMBO_PUSH,
                                ImageResources.COMBO_DISABLE);
@@ -1140,7 +1146,7 @@ public class CoolbarArea {
                bracketLabel.setImage(bracketImage);
 
                // Creates application combo.
-               appCombo = new TizenCombo(parent, SWT.NONE);
+               appCombo = new DACustomCombo(parent, SWT.NONE);
                appCombo.setImages(ImageResources.COMBO_NORMAL,
                                ImageResources.COMBO_HOVER, ImageResources.COMBO_PUSH,
                                ImageResources.COMBO_DISABLE);
@@ -1177,16 +1183,16 @@ public class CoolbarArea {
        }
 
        private void createPageBar(Composite parent) {
-               pageTab = new ArrayList<DAButton>();
+               pageTab = new ArrayList<DACustomButton>();
 
-               pageTab.add(new DAButton(parent, tabNormalImage, tabPushImage,
+               pageTab.add(new DACustomButton(parent, tabNormalImage, tabPushImage,
                                tabHoverImage, tabDisableImage));
-               pageTab.add(new DAButton(parent, tabNormalImage, tabPushImage,
+               pageTab.add(new DACustomButton(parent, tabNormalImage, tabPushImage,
                                tabHoverImage, tabDisableImage));
-               pageTab.add(new DAButton(parent, tabNormalImage, tabPushImage,
+               pageTab.add(new DACustomButton(parent, tabNormalImage, tabPushImage,
                                tabHoverImage, tabDisableImage));
 
-               pageTab.add(new DAButton(parent, tabNormalImage, tabPushImage,
+               pageTab.add(new DACustomButton(parent, tabNormalImage, tabPushImage,
                                tabHoverImage, tabDisableImage)); // FIXME
 
                pageTab.get(TAB_MAIN).setForeground(ColorResources.WHITE);
@@ -1599,18 +1605,18 @@ public class CoolbarArea {
                this.windowHeight = height;
        }
 
-       public void setSourceViewButtonToggleState(boolean isToggled) {
-               if (!isToggled) {
-                       sourceViewToggleState = false;
-                       viewSourceButton.setImage(viewSourceImage);
-               } else if (isToggled) {
-                       sourceViewToggleState = true;
-                       viewSourceButton.setImage(viewSourceToggleImage);
-               }
-       }
+//     public void setSourceViewButtonToggleState(boolean isToggled) {
+//             if (!isToggled) {
+//                     sourceViewToggleState = false;
+//                     viewSourceButton.setImage(viewSourceImage);
+//             } else if (isToggled) {
+//                     sourceViewToggleState = true;
+//                     viewSourceButton.setImage(viewSourceToggleImage);
+//             }
+//     }
 
        public boolean getSourceViewToggleState() {
-               return sourceViewToggleState;
+               return viewSourceButton.isToggled();
        }
 
        public void setStartToolbarEnablement(boolean enabled) {
@@ -1659,25 +1665,25 @@ public class CoolbarArea {
 
        public void stopTrace() {
                AnalyzerUtil.setRecordState(RecordStateSourceProvider.RECORD_READY);
-               startButton.setImage(startImage);
+               startButton.setNormalImage(startImage);
                startButton.setToolTipText(AnalyzerLabels.START_TRACE);
                setStartToolbarState(false);
                setToolbarEnablement(true);
        }
 
-       public DAButton getMainButton() {
+       public DACustomButton getMainButton() {
                return pageTab.get(TAB_MAIN);
        }
 
-       public DAButton getAnalysisButton() {
+       public DACustomButton getAnalysisButton() {
                return pageTab.get(TAB_ANALYSIS);
        }
 
-       public DAButton getFileButton() {
+       public DACustomButton getFileButton() {
                return pageTab.get(TAB_FILE);
        }
 
-       public DAButton getThreadButton() {
+       public DACustomButton getThreadButton() {
                return pageTab.get(TAB_THREAD);
        }
 
index 39668e5..e26e950 100644 (file)
@@ -17,13 +17,13 @@ import org.eclipse.swt.layout.FillLayout;
 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.tizen.dynamicanalyzer.listeners.DAButtonClickEventListener;
 import org.tizen.dynamicanalyzer.ui.views.CoolbarArea;
 import org.tizen.dynamicanalyzer.ui.views.ThreadPage.ThreadPage;
 import org.tizen.dynamicanalyzer.ui.views.filePage.FilePage;
 import org.tizen.dynamicanalyzer.ui.views.summaryPage.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.views.timelinePage.TimelinePage;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 
 public class DAEffectFrame extends AbstractEffectFrame {
 
@@ -100,11 +100,11 @@ public class DAEffectFrame extends AbstractEffectFrame {
                                                .getInstance()
                                                .getMainButton()
                                                .addClickListener(
-                                                               new DAButtonClickEventListener(CoolbarArea
-                                                                               .getInstance().getMainButton()) {
+                                                               new DACustomButtonClickEventListener() {
+
                                                                        @Override
-                                                                       public void handleClickEvent(Event event) {
-                                                                               // TODO Auto-generated method stub
+                                                                       public void handleClickEvent(
+                                                                                       DACustomButton button) {
                                                                                if (currentStack == MAIN_INDEX
                                                                                                || effectLock) {
                                                                                        return;
@@ -119,11 +119,10 @@ public class DAEffectFrame extends AbstractEffectFrame {
                                                .getInstance()
                                                .getAnalysisButton()
                                                .addClickListener(
-                                                               new DAButtonClickEventListener(CoolbarArea
-                                                                               .getInstance().getMainButton()) {
+                                                               new DACustomButtonClickEventListener() {
                                                                        @Override
-                                                                       public void handleClickEvent(Event event) {
-                                                                               // TODO Auto-generated method stub
+                                                                       public void handleClickEvent(
+                                                                                       DACustomButton button) {
                                                                                if (currentStack == ANALYSIS_INDEX
                                                                                                || effectLock) {
                                                                                        return;
@@ -132,17 +131,18 @@ public class DAEffectFrame extends AbstractEffectFrame {
                                                                                setTopComposite(ANALYSIS_INDEX);
                                                                                CoolbarArea.getInstance()
                                                                                                .setSelectionTab(1);
+
                                                                        }
                                                                });
                                CoolbarArea
                                                .getInstance()
                                                .getFileButton()
                                                .addClickListener(
-                                                               new DAButtonClickEventListener(CoolbarArea
-                                                                               .getInstance().getMainButton()) {
+                                                               new DACustomButtonClickEventListener() {
+
                                                                        @Override
-                                                                       public void handleClickEvent(Event event) {
-                                                                               // TODO Auto-generated method stub
+                                                                       public void handleClickEvent(
+                                                                                       DACustomButton button) {
                                                                                if (currentStack == FILE_INDEX
                                                                                                || effectLock) {
                                                                                        return;
@@ -157,11 +157,10 @@ public class DAEffectFrame extends AbstractEffectFrame {
                                                .getInstance()
                                                .getThreadButton()
                                                .addClickListener(
-                                                               new DAButtonClickEventListener(CoolbarArea
-                                                                               .getInstance().getMainButton()) {
+                                                               new DACustomButtonClickEventListener() {
                                                                        @Override
-                                                                       public void handleClickEvent(Event event) {
-                                                                               // TODO Auto-generated method stub
+                                                                       public void handleClickEvent(
+                                                                                       DACustomButton button) {
                                                                                if (currentStack == THREAD_INDEX
                                                                                                || effectLock) {
                                                                                        return;
@@ -171,7 +170,6 @@ public class DAEffectFrame extends AbstractEffectFrame {
                                                                                                .setSelectionTab(3);
                                                                        }
                                                                });
-
                        }
                });
        }
index 3db8eda..398a1d7 100644 (file)
@@ -9,17 +9,15 @@ 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.Event;
 import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.FontResources;
 import org.tizen.dynamicanalyzer.constants.DesignConstants;
-import org.tizen.dynamicanalyzer.listeners.DAButtonClickEventListener;
 import org.tizen.dynamicanalyzer.model.DASelectionData;
 import org.tizen.dynamicanalyzer.model.DAView;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.ui.views.base.ViewAction;
-import org.tizen.dynamicanalyzer.ui.widgets.button.DAButton;
-
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 
 public class DATabComposite extends DAView {
 
@@ -27,7 +25,7 @@ public class DATabComposite extends DAView {
        public static final int LONG_TAB_WIDTH = 70;
        public static final int SHORT_TAB_WIDTH = 70;
 
-       private List<DAButton> buttons = null;
+       private List<DACustomButton> buttons = null;
        private List<Composite> children = null;
        private Composite tabComposite = null;
        private Composite contentsComposite = null;
@@ -64,7 +62,8 @@ public class DATabComposite extends DAView {
                // final DAButton tabButton = new DAButton(tabComposite,
                // ImageResources.TAB, ImageResources.TAB_PUSH,
                // ImageResources.TAB_HOVER, ImageResources.TAB_DISABLE);
-               final DAButton tabButton = new DAButton(tabComposite, SWT.NONE);
+               final DACustomButton tabButton = new DACustomButton(tabComposite,
+                               SWT.NONE);
                tabButton.setEnabled(true);
                tabButton.setFont(FontResources.TAB_BUTTON_FONT);
                tabButton.setForeground(ColorResources.WHITE);
@@ -76,7 +75,7 @@ public class DATabComposite extends DAView {
                data.bottom = new FormAttachment(100, 0);
 
                if (getButtons().size() > 0) {
-                       DAButton button1 = getButtons().get(getButtons().size() - 1);
+                       DACustomButton button1 = getButtons().get(getButtons().size() - 1);
                        data.left = new FormAttachment(button1, 0);
                        data.width = SHORT_TAB_WIDTH;
                } else {
@@ -85,11 +84,10 @@ public class DATabComposite extends DAView {
                }
                tabButton.setLayoutData(data);
                final Composite tempChild = child;
-               DAButtonClickEventListener buttonListener = new DAButtonClickEventListener(
-                               tabButton) {
+               DACustomButtonClickEventListener buttonListener = new DACustomButtonClickEventListener() {
 
                        @Override
-                       public void handleClickEvent(Event event) {
+                       public void handleClickEvent(DACustomButton button) {
                                stackLayout.topControl = tempChild;
                                ((ViewAction) tempChild).updateView();
                                changeButtonLayout(tabButton);
@@ -108,12 +106,12 @@ public class DATabComposite extends DAView {
                }
        }
 
-       private void changeButtonLayout(DAButton button) {
+       private void changeButtonLayout(DACustomButton button) {
                int size = getButtons().size();
-               DAButton prev = null;
+               DACustomButton prev = null;
                if (size > 1) {
                        for (int i = 0; i < size; i++) {
-                               DAButton sample = getButtons().get(i);
+                               DACustomButton sample = getButtons().get(i);
 
                                FormData data = new FormData();
                                data.top = new FormAttachment(0, 0);
@@ -144,9 +142,9 @@ public class DATabComposite extends DAView {
                return children;
        }
 
-       private List<DAButton> getButtons() {
+       private List<DACustomButton> getButtons() {
                if (null == buttons) {
-                       buttons = new ArrayList<DAButton>();
+                       buttons = new ArrayList<DACustomButton>();
                }
                return buttons;
        }
@@ -154,24 +152,24 @@ public class DATabComposite extends DAView {
        public Composite getContentComposite() {
                return contentsComposite;
        }
-       
-       public void setEnableTab(Composite tab){
+
+       public void setEnableTab(Composite tab) {
                int iButton = -1;
-               
-               if(null == tab)
+
+               if (null == tab)
                        return;
 
-               for(int i = 0; i < children.size(); i++){
-                       if(children.get(i) == tab){
+               for (int i = 0; i < children.size(); i++) {
+                       if (children.get(i) == tab) {
                                iButton = i;
                                break;
                        }
                }
-               if(-1 != iButton && null != buttons && iButton < buttons.size()){
-                       
+               if (-1 != iButton && null != buttons && iButton < buttons.size()) {
+
                        stackLayout.topControl = tab;
                        ((ViewAction) tab).updateView();
-                       
+
                        contentsComposite.layout();
                        changeButtonLayout(buttons.get(iButton));
                }
@@ -198,8 +196,8 @@ public class DATabComposite extends DAView {
        @Override
        public void updateView(DASelectionData data) {
                ((ViewAction) stackLayout.topControl).updateView(data);
-//             for(int i=0; i<children.size();i++){
-//                     ((ViewAction) children.get(i)).updateView(data);
-//             }
+               // for(int i=0; i<children.size();i++){
+               // ((ViewAction) children.get(i)).updateView(data);
+               // }
        }
 }
index a8bb406..de0be08 100644 (file)
@@ -16,16 +16,16 @@ import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.FontResources;\r
 import org.tizen.dynamicanalyzer.ImageResources;\r
 import org.tizen.dynamicanalyzer.constants.AnalyzerConstants;\r
-import org.tizen.dynamicanalyzer.listeners.DAButtonClickEventListener;\r
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;\r
-import org.tizen.dynamicanalyzer.ui.widgets.button.DAButton;\r
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;\r
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;\r
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;\r
 \r
 \r
 public class DAWindow {\r
 \r
        private Shell shell;\r
-       private DAButton closeButton;\r
+       private DACustomButton closeButton;\r
        private String title = AnalyzerConstants.EMPTY;\r
        private boolean bMove = true;\r
 \r
@@ -136,14 +136,14 @@ public class DAWindow {
 \r
        public DAWindow(Shell parent, int style) {\r
                shell = new Shell(parent, style | SWT.NO_TRIM | SWT.NO_BACKGROUND | SWT.CENTER);\r
-               closeButton = new DAButton(shell, closeImage, closePushImage,\r
+               closeButton = new DACustomButton(shell, closeImage, closePushImage,\r
                                closeHoverImage, null);\r
                closeButton.setToolTipText(AnalyzerLabels.CLOSE);\r
-               closeButton.getControl().setBackground(ColorResources.TITLEBAR_BG_COLOR);\r
+               closeButton.setBackground(ColorResources.TITLEBAR_BG_COLOR);\r
                closeButton\r
-                               .addClickListener(new DAButtonClickEventListener(closeButton) {\r
+                               .addClickListener(new DACustomButtonClickEventListener() {\r
                                        @Override\r
-                                       public void handleClickEvent(Event event) {\r
+                                       public void handleClickEvent(DACustomButton button) {\r
                                                shell.dispose();\r
                                        }\r
                                });\r
index 8bf0413..7be6549 100644 (file)
@@ -15,7 +15,6 @@ 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.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.AnalyzerManager;
@@ -25,11 +24,11 @@ import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.handlers.ClearHandler;
 import org.tizen.dynamicanalyzer.handlers.OpenTraceHandler;
-import org.tizen.dynamicanalyzer.listeners.DAButtonClickEventListener;
 import org.tizen.dynamicanalyzer.model.Project;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
-import org.tizen.dynamicanalyzer.ui.widgets.button.DAButton;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
+import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 
 public class OpenTraceDialog extends Window {
        private Shell parent = null;
@@ -37,8 +36,8 @@ public class OpenTraceDialog extends Window {
        private Grid saveTable = null;
        private Grid tempTable = null;
        private Grid selectedTable = null;
-       private DAButton okButton = null;
-       private DAButton cancelButton = null;
+       private DACustomButton okButton = null;
+       private DACustomButton cancelButton = null;
 
        // (open,close)button image
        private final Image buttonImage = ImageResources.DIALOG_NORMAL;
@@ -50,10 +49,10 @@ public class OpenTraceDialog extends Window {
                this.parent = parent;
        }
 
-       private DAButtonClickEventListener okButtonListener = new DAButtonClickEventListener(
-                       okButton) {
+       private DACustomButtonClickEventListener okButtonListener = new DACustomButtonClickEventListener() {
+
                @Override
-               public void handleClickEvent(Event event) {
+               public void handleClickEvent(DACustomButton button) {
                        if (null != selectedTable) {
                                GridItem[] selections = selectedTable.getSelection();
                                if (null == selections || 0 == selections.length) {
@@ -81,10 +80,11 @@ public class OpenTraceDialog extends Window {
                }
        };
 
-       private DAButtonClickEventListener cancelButtonListener = new DAButtonClickEventListener(
-                       cancelButton) {
+       private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener(
+                       ) {
+
                @Override
-               public void handleClickEvent(Event event) {
+               public void handleClickEvent(DACustomButton button) {
                        shell.dispose();
                }
        };
@@ -238,7 +238,7 @@ public class OpenTraceDialog extends Window {
                compData.bottom = new FormAttachment(100, 0);
                buttonComp.setLayoutData(compData);
 
-               okButton = new DAButton(buttonComp, buttonImage, buttonPushImage,
+               okButton = new DACustomButton(buttonComp, buttonImage, buttonPushImage,
                                buttonHoverImage, null);
                okButton.addClickListener(okButtonListener);
                okButton.setText("Open"); //$NON-NLS-1$
@@ -252,7 +252,7 @@ public class OpenTraceDialog extends Window {
                okData.height = 34;
                okButton.setLayoutData(okData);
 
-               cancelButton = new DAButton(buttonComp, buttonImage, buttonPushImage,
+               cancelButton = new DACustomButton(buttonComp, buttonImage, buttonPushImage,
                                buttonHoverImage, null);
                cancelButton.addClickListener(cancelButtonListener);
                cancelButton.setText("Close"); //$NON-NLS-1$
index 7751316..4624ddb 100644 (file)
@@ -8,10 +8,10 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.FontResources;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenComboPopupRenderer;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboPopupRenderer;
 
 
-public class TitleComboPopupRenderer extends TizenComboPopupRenderer {
+public class TitleComboPopupRenderer extends DACustomComboPopupRenderer {
 
        @Override
        public void draw(GC gc, Canvas canvas, int state, List<Rectangle> rects,
index b38473b..01f93d6 100644 (file)
@@ -8,10 +8,10 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.FontResources;
-import org.tizen.dynamicanalyzer.widgets.combo.TizenComboRenderer;
+import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboRenderer;
 
 
-public class TitleComboRenderer extends TizenComboRenderer {
+public class TitleComboRenderer extends DACustomComboRenderer {
 
        @Override
        public void draw(GC gc, Canvas canvas, String text, int state) {