From 843f18619efb33aecf48b7d4c4b7881da07996e7 Mon Sep 17 00:00:00 2001 From: "joon.c.baek" Date: Mon, 30 May 2016 14:54:54 +0900 Subject: [PATCH] [SRADA-700][SRADA-701][SRADA-702] Resolve offline code review Change-Id: I1f2d65f7220518d31dc6b82944db5fc139edc28f Signed-off-by: joon.c.baek --- .../button/toggle/DACustomFeatureToggleButton.java | 4 +-- .../toggle/DACustomFeatureToggleButtonGroup.java | 2 +- .../DACustomFeatureToggleButtonRenderer.java | 12 +-------- .../toggle/DACustomMultiToggleButtonGroup.java | 2 +- .../button/toggle/DACustomToggleButton.java | 4 +-- .../ui/toolbar/setting/FlatFeatureDialog.java | 5 ---- .../setting/FlatFeatureDialogFeatureListPage.java | 31 +--------------------- .../FlatFeatureDialogSelectedFeaturePage.java | 6 +---- .../setting/FlatFeatureDialogTargetPage.java | 2 -- 9 files changed, 9 insertions(+), 59 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButton.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButton.java index 0f0c36b..26cbae0 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButton.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButton.java @@ -45,7 +45,7 @@ public class DACustomFeatureToggleButton extends DACustomButton { private boolean toggle = false; private boolean toggleByButton = false; - protected Listener toggleButtonMouseListener = new Listener() { + private Listener toggleButtonMouseListener = new Listener() { @Override public void handleEvent(Event event) { @@ -215,7 +215,7 @@ public class DACustomFeatureToggleButton extends DACustomButton { return attr.getTooltipButton(); } - protected void addToggleListeners() { + private void addToggleListeners() { if (null != toggleButtonMouseListener) { this.addListener(SWT.MouseEnter, toggleButtonMouseListener); this.addListener(SWT.MouseExit, toggleButtonMouseListener); diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonGroup.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonGroup.java index 520a704..778ae69 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonGroup.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonGroup.java @@ -63,7 +63,7 @@ public class DACustomFeatureToggleButtonGroup { return toggleButtonList; } - protected Listener mouseListener = new Listener() { + private Listener mouseListener = new Listener() { @Override public void handleEvent(Event event) { diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonRenderer.java index 6ce8315..4f7282b 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomFeatureToggleButtonRenderer.java @@ -37,12 +37,8 @@ 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.FormAttachment; -import org.eclipse.swt.layout.FormData; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Label; -import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; @@ -78,25 +74,18 @@ public class DACustomFeatureToggleButtonRenderer extends DACustomButtonRenderer } Rectangle r = new Rectangle(0, 0, rect.width - 1, rect.height - 1); - // 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); } 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; } gc.setForeground(c); } @@ -174,6 +163,7 @@ public class DACustomFeatureToggleButtonRenderer extends DACustomButtonRenderer if (null != (text = attr.getDescription())) { // draw description font = attr.getDescFont(); gc.setFont(font); + // TODO: Hardcorded layout value should be replaced to symbol x = 22 + 70 + 28; y = 30 + 10 + 9; int pixSize = gc.getFontMetrics().getAverageCharWidth(); int index = 0; diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomMultiToggleButtonGroup.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomMultiToggleButtonGroup.java index fb84721..b14ab4b 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomMultiToggleButtonGroup.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomMultiToggleButtonGroup.java @@ -109,7 +109,7 @@ public class DACustomMultiToggleButtonGroup { return toggleButtonList; } - protected Listener mouseListener = new Listener() { + private Listener mouseListener = new Listener() { @Override public void handleEvent(Event event) { diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButton.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButton.java index e714968..372456c 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButton.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButton.java @@ -44,7 +44,7 @@ public class DACustomToggleButton extends DACustomButton { private boolean toggle = false; private boolean toggleByButton = false; - protected Listener toggleButtonMouseListener = new Listener() { + private Listener toggleButtonMouseListener = new Listener() { @Override public void handleEvent(Event event) { @@ -174,7 +174,7 @@ public class DACustomToggleButton extends DACustomButton { attr.setOutlineInColor(STATE_TOGGLE_PUSH, togglePush); } - protected void addToggleListeners() { + private void addToggleListeners() { if (null != toggleButtonMouseListener) { this.addListener(SWT.MouseEnter, toggleButtonMouseListener); this.addListener(SWT.MouseExit, toggleButtonMouseListener); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java index 2bdad23..3f5fda6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialog.java @@ -135,11 +135,6 @@ public class FlatFeatureDialog extends DAMessageBox { } } - private void doWarningMessage() { - UIAction.showWarning(ConfigureLabels.SETTING_WARNING_MESSAGE_SETTING_INVALID_INPUT_VALUE, - 550, 153); - } - protected boolean run() { if (opened) { return false; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java index 22cde45..91ee8e3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java @@ -71,35 +71,21 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { private DACustomMultiToggleButtonGroup featuretoggleGroup = null; private int FEATURELIST_TITLE_FONT_SIZE = 0; - private int FEATURELIST_NAME_FONT_SIZE = 0; - private int FEATURELIST_TEXT_FONT_SIZE = 0; private int FEATURELIST_ICON_SIZE = 0; private int FEATURELIST_TOOLTIP_SIZE = 0; private int FEATURELIST_COMP_WIDTH = 0; - private int FEATURELIST_COMP_HEIGHT = 0; private int FEATURELIST_COMP_MARGIN = 0; private int FEATURELIST_COMP_ITEM_LEFT_MARGIN = 0; private int FEATURELIST_TITLE_HEIGHT = 0; private int FEATURELIST_TITLE_MARGIN = 0; private int FEATURELIST_BODY_TOP = 0; - private int FEATURELIST_BODY_HEIGHT = 0; - private int FEATURELIST_BODY_UPPER_MARGIN = 0; private int FEATURELIST_BODY_ITEM_HEIGHT = 0; private int FEATURELIST_BODY_ITEM_MARGIN = 0; private int FEATURELIST_BODY_ITEM_WIDTH = 0; - private int FEATURELIST_BODY_ITEM_TEXT_WIDTH = 0; private int FEATURELIST_BODY_ITEM_TEXT_LARGE_HEIGHT = 0; - private int FEATURELIST_BODY_ITEM_TEXT_SMALL_HEIGHT = 0; private int FEATURELIST_BODY_ITEM_LARGE_VERT_MARGIN = 0; - private int FEATURELIST_BODY_ITEM_SMALL_VERT_MARGIN = 0; - private int FEATURELIST_BODY_ITEM_LABEL_MARGIN = 0; - private int FEATURELIST_BODY_ITEM_TITLE_MARGIN = 0; - private int FEATURELIST_BODY_ITEM_DESC_MARGIN = 0; - private int FEATURELIST_BODY_ITEM_PAGE_MARGIN = 0; - private int FEATURELIST_TOOLTIP_RIGHT_MARGIN = 0; private int FEATURELIST_TOOLTIP_UPPER_MARGIN = 0; - private int FEATURELIST_TOOLTIP_BOX_RIGHT_MARGIN = 0; public FlatFeatureDialogFeatureListPage(Composite parent, FlatFeatureDialog parentObject, int style) { super(parent, style); @@ -112,35 +98,21 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { // TODO: Add handling at MAC FEATURELIST_TITLE_FONT_SIZE = 10 + 6; - FEATURELIST_NAME_FONT_SIZE = 8 + 5; - FEATURELIST_TEXT_FONT_SIZE = 7 + 5; FEATURELIST_ICON_SIZE = 70; FEATURELIST_TOOLTIP_SIZE = 20; - FEATURELIST_COMP_WIDTH = featureDialog.FEATURE_WIDTH; - FEATURELIST_COMP_HEIGHT = featureDialog.FEATURE_HEIGHT; FEATURELIST_COMP_MARGIN = featureDialog.LINE; FEATURELIST_COMP_ITEM_LEFT_MARGIN = 22; FEATURELIST_TITLE_HEIGHT = featureDialog.TITLE_HEIGHT; FEATURELIST_TITLE_MARGIN = (FEATURELIST_TITLE_HEIGHT - FEATURELIST_TITLE_FONT_SIZE)/2; FEATURELIST_BODY_TOP = FEATURELIST_TITLE_HEIGHT + FEATURELIST_COMP_MARGIN + 1; - FEATURELIST_BODY_HEIGHT = FEATURELIST_COMP_HEIGHT - FEATURELIST_TITLE_HEIGHT - FEATURELIST_COMP_MARGIN; - FEATURELIST_BODY_UPPER_MARGIN = 30; FEATURELIST_BODY_ITEM_HEIGHT = 119; FEATURELIST_BODY_ITEM_WIDTH = 593; FEATURELIST_BODY_ITEM_MARGIN = 1; - FEATURELIST_BODY_ITEM_TEXT_WIDTH = 380; FEATURELIST_BODY_ITEM_TEXT_LARGE_HEIGHT = 75; - FEATURELIST_BODY_ITEM_TEXT_SMALL_HEIGHT = 60; FEATURELIST_BODY_ITEM_LARGE_VERT_MARGIN = (FEATURELIST_BODY_ITEM_HEIGHT - FEATURELIST_BODY_ITEM_TEXT_LARGE_HEIGHT)/2; - FEATURELIST_BODY_ITEM_SMALL_VERT_MARGIN = (FEATURELIST_BODY_ITEM_HEIGHT - FEATURELIST_BODY_ITEM_TEXT_SMALL_HEIGHT)/2; - FEATURELIST_BODY_ITEM_LABEL_MARGIN = 28; - FEATURELIST_BODY_ITEM_TITLE_MARGIN = (FEATURELIST_BODY_ITEM_HEIGHT - FEATURELIST_TITLE_FONT_SIZE)/2; - FEATURELIST_BODY_ITEM_DESC_MARGIN = 9; - FEATURELIST_BODY_ITEM_PAGE_MARGIN = 16; FEATURELIST_TOOLTIP_UPPER_MARGIN = FEATURELIST_BODY_ITEM_LARGE_VERT_MARGIN + (FEATURELIST_ICON_SIZE - FEATURELIST_TOOLTIP_SIZE)/2; - FEATURELIST_TOOLTIP_RIGHT_MARGIN = 34; - FEATURELIST_TOOLTIP_BOX_RIGHT_MARGIN = 10; + createFeatureListComposite(); } @@ -251,7 +223,6 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { toggleButton.getParent().setBackground(ColorResources.FEATURE_FEATURELISTCOMP_SELECT_BACKGROUND); toggleButton.getTooltipButton().setBackground(ColorResources.FEATURE_FEATURELISTCOMP_SELECT_BACKGROUND); } - //createFeatureListComposite(); featureDialog.getSelectedFeaturePage().createSelectedFeatureComposite(); } }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogSelectedFeaturePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogSelectedFeaturePage.java index 4b689fe..e6af326 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogSelectedFeaturePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogSelectedFeaturePage.java @@ -229,8 +229,7 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { selecetedScrolledComp.setBackground(ColorResources.FEATURE_FEATURELISTCOMP_NORMAL_BACKGROUND); selecetedScrolledComp.addPaintListener(new PaintListener() { public void paintControl(PaintEvent e) { - //e.gc.setForeground(ColorResources.FEATURE_FEATURELISTCOMP_LINE); - e.gc.setForeground(ColorResources.BLUE); + e.gc.setForeground(ColorResources.FEATURE_FEATURELISTCOMP_LINE); e.gc.drawLine(0, 0, WIDTH, 0); } }); @@ -256,10 +255,8 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { if (featureList.size() > 0) featureDialog.getOKButton().setEnabled(true); - //featureDialog.getOKButton().setButtonEnabled(true); else { featureDialog.getOKButton().setEnabled(false); - //featureDialog.getOKButton().setButtonEnabled(false); // label : No Item Selected noItemLabel = new Label(selectedInputComp, SWT.TRANSPARENT); @@ -318,7 +315,6 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { DACustomToggleButton toggleButton = (DACustomToggleButton) event.widget; TargetData target = SettingDataManager.INSTANCE.getTarget(null); target.removeSelectedFlatFeature(toggleButton.getText()); - //featureDialog.getFeatureListPage().createFeatureListComposite(); featureDialog.getFeatureListPage().featureToggleUnselect(toggleButton.getText()); createSelectedFeatureComposite(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogTargetPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogTargetPage.java index 8c6c3a0..81869db 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogTargetPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogTargetPage.java @@ -72,7 +72,6 @@ public class FlatFeatureDialogTargetPage extends DAPageComposite { private Image normalImage = null; private Image overImage = null; public static int imageWidth = 40; - public static int imageHeight = 40; private ProfileDisplayInfo(int id, String displayName, Image focusImage, Image normalImage, Image overImage) { this.displayName = displayName; @@ -125,7 +124,6 @@ public class FlatFeatureDialogTargetPage extends DAPageComposite { private int LINE = 0; private int TARGET_COMP_ITEM_LEFT_MARGIN = 0; - private int TARGET_TITLE_TOP = 0; private int TARGET_TITLE_HEIGHT = 0; private int TARGET_TITLE_MARGIN = 0; -- 2.7.4