From c6e28ff97d81a0d87d12024af4f1b6d929938a04 Mon Sep 17 00:00:00 2001
From: greatim <jaewon81.lim@samsung.com>
Date: Fri, 19 Sep 2014 14:46:15 +0900
Subject: [PATCH] MERGE: fix a missing conflict during merge

fix a missing conflict during merge

Change-Id: I342261f3b082c1ff8af786700b0ff3320c4e977c
Signed-off-by: greatim <jaewon81.lim@samsung.com>
---
 .../toggle/DACustomToggleButtonRenderer.java       | 61 +++++++++-------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java
index e4f27ee..1dfca7f 100644
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java
@@ -39,16 +39,12 @@ import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute;
-<<<<<<< HEAD
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer;
-=======
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
->>>>>>> tizen
 
 public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 	@Override
-	public void draw(GC gc, Canvas canvas, int state,
-			DACustomButtonAttribute attr) {
+	public void draw(GC gc, Canvas canvas, int state, DACustomButtonAttribute attr) {
 		Rectangle rect = canvas.getClientArea();
 		if (attr.getDrawType() == DACustomButton.TYPE_IMAGE) {
 			Image image = attr.getImage(state);
@@ -65,8 +61,7 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 		}
 	}
 
-	protected void drawButton(GC gc, Rectangle rect, int state,
-			DACustomButtonAttribute attr) {
+	protected void drawButton(GC gc, Rectangle rect, int state, DACustomButtonAttribute attr) {
 		if (attr.getDrawType() == DACustomButton.TYPE_COLOR) {
 			gc.setBackground(attr.getColor(state));
 			gc.fillRectangle(rect);
@@ -74,49 +69,47 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 			int index = state * 2;
 			gc.setForeground(attr.getColor(index));
 			gc.setBackground(attr.getColor(index + 1));
-			gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height,
-					true);
+			gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height, true);
 		}
 
 		Rectangle r = new Rectangle(0, 0, rect.width - 1, rect.height - 1);
-//		if (attr.getButtonImage() == null) {
-			drawButtonText(gc, r, attr, state);
-//		}
-			
+		// if (attr.getButtonImage() == null) {
+		drawButtonText(gc, r, attr, state);
+		// }
+
 		// draw outline
 		Color c = gc.getForeground();
 		if (null != attr.getOutlineColor(state)) {
 			gc.setForeground(attr.getOutlineColor(state));
 			gc.drawRectangle(r);
-//		} else {
-//			gc.setForeground(ColorResources.BLACK);
+			// } else {
+			// gc.setForeground(ColorResources.BLACK);
 		}
-		Rectangle ir = new Rectangle(r.x + 1, r.y + 1, r.width - 2,
-				r.height - 2);
+		Rectangle ir = new Rectangle(r.x + 1, r.y + 1, r.width - 2, r.height - 2);
 		if (null != attr.getOutlineInColor(state)) {
 			gc.setForeground(attr.getOutlineInColor(state));
 			gc.drawRectangle(ir);
-//		} else {
-//			gc.setForeground(c);
-//			return;
+			// } else {
+			// gc.setForeground(c);
+			// return;
 		}
 		gc.setForeground(c);
 	}
-	
-	private void drawButtonToggleImage(GC gc, Rectangle rect,
-			int state, DACustomButtonAttribute attr) {
+
+	private void drawButtonToggleImage(GC gc, Rectangle rect, int state,
+			DACustomButtonAttribute attr) {
 		Point p = null;
 		Image img = null;
 		Rectangle imgRect = null;
-		
+
 		if (state < DACustomToggleButton.STATE_TOGGLE) {
 			// draw normal image
 			img = attr.getButtonImage(DACustomToggleButton.STATE_NORMAL);
-		} else {	// state >= DACustomToggleButton.STATE_TOGGLE
+		} else { // state >= DACustomToggleButton.STATE_TOGGLE
 			// draw toggle image
 			img = attr.getButtonImage(DACustomToggleButton.STATE_TOGGLE);
 		}
-		
+
 		if (null != img) {
 			imgRect = img.getBounds();
 			int x = 0, y = 0;
@@ -137,20 +130,18 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 			} else {
 				x = p.x;
 				y = p.y;
-			}				
+			}
 			gc.drawImage(img, x, y);
 		}
-		
+
 	}
-	
-	protected void drawButtonText(GC gc, Rectangle rect,
-			DACustomButtonAttribute attr, int state) {
+
+	protected void drawButtonText(GC gc, Rectangle rect, DACustomButtonAttribute attr, int state) {
 		String text = null;
 		Font font = null;
 		Point p = null;
 
-		Rectangle textRect = new Rectangle(rect.x, rect.y, rect.width,
-				rect.height);
+		Rectangle textRect = new Rectangle(rect.x, rect.y, rect.width, rect.height);
 		if (null != attr.getIcon()) {
 			Rectangle iconRect = attr.getIcon().getBounds();
 			textRect.x = textRect.x + iconRect.width;
@@ -195,7 +186,7 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 						offset = 2;
 					}
 				}
-				
+
 				if (y < 0) {
 					p = gc.textExtent(text, SWT.DRAW_MNEMONIC);
 					y = p.y;
@@ -213,7 +204,7 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer {
 				x += 1;
 				y += 1;
 			}
-			
+
 			// draw string
 			gc.drawString(text, x + offset, y, true);
 		}
-- 
2.7.4