From f06b3ca14eb873d94542eda6c78e6a1af6f83e7f Mon Sep 17 00:00:00 2001 From: "joon.c.baek" Date: Tue, 9 Aug 2016 11:52:46 +0900 Subject: [PATCH] [SRADA-1002] Remove debug logs in feature dialog This log shows feature selection states for debugging, FeatureList, SelectedFeatureList generate that messages. However, No more need it. And, Remove whitespace. Change-Id: Iadc7690235dd36b9fee2c7176742677573a935fe Signed-off-by: joon.c.baek --- .../setting/FlatFeatureDialogFeatureListPage.java | 40 ++++++++++------------ .../FlatFeatureDialogSelectedFeaturePage.java | 27 +++++++-------- 2 files changed, 31 insertions(+), 36 deletions(-) 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 24919a0..d3751d8 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 @@ -3,7 +3,7 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: + * Contact: * Heeyoung Hwang * Juyoung Kim * @@ -18,10 +18,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * Contributors: * - S-Core Co., Ltd - * + * */ package org.tizen.dynamicanalyzer.ui.toolbar.setting; @@ -58,7 +58,7 @@ import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomFeatureToggleButt import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; import org.tizen.dynamicanalyzer.widgets.tooltip.DACustomTooltip; -public class FlatFeatureDialogFeatureListPage extends DAPageComposite { +public class FlatFeatureDialogFeatureListPage extends DAPageComposite { // feature list widget private FlatFeatureDialog featureDialog = null; @@ -73,12 +73,12 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { private DACustomTooltip tooltip = null; private DACustomMultiToggleButtonGroup featuretoggleGroup = null; private Cursor daCursor = null; - + private int FEATURELIST_TITLE_FONT_SIZE = 0; private int FEATURELIST_ICON_SIZE = 0; private int FEATURELIST_TOOLTIP_SIZE = 0; private int FEATURELIST_TOOLTIP_BOX_WIDTH = 0; - + private int FEATURELIST_COMP_WIDTH = 0; private int FEATURELIST_COMP_MARGIN = 0; private int FEATURELIST_COMP_ITEM_LEFT_MARGIN = 0; @@ -100,7 +100,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { // Composite featureListComp = parent; featureDialog = parentObject; - + // TODO: Add handling at MAC FEATURELIST_TITLE_FONT_SIZE = 10 + 6; FEATURELIST_ICON_SIZE = 70; @@ -122,7 +122,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { createFeatureListComposite(); } - + private void initFeatureListWidget() { if (null != featureListLabel) { featureListLabel.dispose(); @@ -138,7 +138,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { featureListDescLabel.dispose(); featureListDescLabel = null; } - + if (null != featureListPageLabel) { featureListPageLabel.dispose(); featureListPageLabel = null; @@ -153,7 +153,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { featureListInputComp.dispose(); featureListInputComp = null; } - + if (null != itemComp) { itemComp.dispose(); itemComp = null; @@ -164,7 +164,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { daCursor = null; } } - + private DACustomFeatureToggleButton createToggleButton(Composite composit, Image normalImage, Image hoverImage, Image pushImage, Image disableImage, Point imagePoint, String title, Point fontPoint, @@ -198,8 +198,8 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { toggle.setLayoutData(data); return toggle; - } - + } + public void featureToggleUnselect(String featurName) { if(featuretoggleGroup != null) { featuretoggleGroup.setSelection(featurName, false); @@ -207,7 +207,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { featuretoggleGroup.getButton(featurName).getTooltipButton().setBackground(ColorResources.FEATURE_FEATURELISTCOMP_NORMAL_BACKGROUND); } } - + private Listener toggleDownListener = new Listener() { @Override public void handleEvent(Event event) { @@ -260,12 +260,12 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { public void createFeatureListComposite() { initFeatureListWidget(); - + // label featureListLabel = new Label(featureListComp, SWT.TRANSPARENT); FormData data = new FormData(); - data.top = new FormAttachment(0, FEATURELIST_TITLE_MARGIN); - data.left = new FormAttachment(0, FEATURELIST_COMP_ITEM_LEFT_MARGIN); + data.top = new FormAttachment(0, FEATURELIST_TITLE_MARGIN); + data.left = new FormAttachment(0, FEATURELIST_COMP_ITEM_LEFT_MARGIN); data.width = FEATURELIST_COMP_WIDTH - FEATURELIST_COMP_ITEM_LEFT_MARGIN; data.height = FEATURELIST_TITLE_HEIGHT - FEATURELIST_TITLE_MARGIN - FEATURELIST_TITLE_FONT_SIZE + 6; featureListLabel.setLayoutData(data); @@ -340,10 +340,8 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { TargetData target = SettingDataManager.INSTANCE.getTarget(null); List featurel = target.getAvailableFeatureList(); List featureList = target.getAvailableFlatFeatureList(); - Logger.debug("Available Feature list: " + featurel); - Logger.debug("Available FlatFeature list: " + featureList); target.getSelectedFlatFeatureList(); - + featuretoggleGroup = new DACustomMultiToggleButtonGroup(); Point imagePoint = new Point(22, 24); @@ -440,5 +438,3 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { } } } - - 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 7bf4a3b..efc0ade 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 @@ -3,7 +3,7 @@ * * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * - * Contact: + * Contact: * Heeyoung Hwang * Juyoung Kim * @@ -18,10 +18,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * Contributors: * - S-Core Co., Ltd - * + * */ package org.tizen.dynamicanalyzer.ui.toolbar.setting; @@ -54,7 +54,7 @@ import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomFeatureToggleButt import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; -public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { +public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { // selectedFeature widget private FlatFeatureDialog featureDialog = null; private Composite selectedComp = null; @@ -66,10 +66,10 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { private Label noItemLabel = null; private DACustomToggleButton delToggle = null; private Cursor daCursor = null; - + private int TITLE_FONT_SIZE = 0; private int ICON_SIZE = 0; - + private int WIDTH = 0; private int HEIGHT = 0; private int LINE = 0; @@ -98,7 +98,7 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { // Composite selectedComp = parent; featureDialog = parentObject; - + // TODO: Add handling at MAC TITLE_FONT_SIZE = 10 + 6; ICON_SIZE = 40; @@ -122,7 +122,7 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { CANCEL_RIGHT = -30; NOITEM_UPPER_MARGIN = (BODY_HEIGHT-TITLE_FONT_SIZE)/2; NOITEM_LEFT_MARGIN = 15; // TODO: Replace '15' with string length - + createSelectedFeatureComposite(); } @@ -191,11 +191,11 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { return toggle; } - + public DACustomToggleButton getDelToggle() { return delToggle; } - + private Listener cursorListener = new Listener() { public void handleEvent(Event event) { if (event.type == SWT.MouseEnter || event.type == SWT.MouseExit) { @@ -289,13 +289,12 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { // listing selected feature list TargetData target = SettingDataManager.INSTANCE.getTarget(null); List featureList = target.getSelectedFlatFeatureList(); - Logger.debug(featureList); if (featureList.size() > 0) featureDialog.getOKButton().setEnabled(true); else { featureDialog.getOKButton().setEnabled(false); - + // label : No Item Selected noItemLabel = new Label(selectedInputComp, SWT.TRANSPARENT); data = new FormData(); @@ -325,7 +324,7 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { data.height = ICON_SIZE; selectedIcon.setLayoutData(data); selectedIcon.setBackground(ColorResources.FEATURE_FEATURELISTCOMP_NORMAL_BACKGROUND); - + // label : featureListName selectedNameLabel = new Label(selectedInputComp, SWT.TRANSPARENT); data = new FormData(); @@ -353,7 +352,7 @@ public class FlatFeatureDialogSelectedFeaturePage extends DAPageComposite { topPosition += (ICON_SIZE + ITEM_DIST); } - + selectedComp.layout(true); selectedInputComp.layout(); selecetedScrolledComp.setMinSize(selectedInputComp.computeSize(SWT.DEFAULT, SWT.DEFAULT)); -- 2.7.4