From 8fedec7f281f8cc332e5a0e8839cd4fc26ecd4d5 Mon Sep 17 00:00:00 2001 From: Vincent Lorenzo Date: Thu, 18 May 2017 10:17:12 +0200 Subject: Bug 516865 - [Releng] [Oxygen] remove unnecessary syso/syse - Remove some sysout, externalize some strings, remove some useless import Change-Id: I69702bd46e16184071643bf26ac39ba84c148e3c Signed-off-by: Vincent Lorenzo --- .../pages/RowConfigurationWizardPage.java | 10 +++++----- .../eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'plugins/infra') diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java index feac88e3c95..2503ab14585 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java @@ -195,19 +195,19 @@ public class RowConfigurationWizardPage extends AbstractAxisConfigurationWizardP final Menu menu = new Menu(addAxisConfiguration); final MenuItem treeFillingItem = new MenuItem(menu, SWT.NONE); treeFillingItem.setText(Messages.RowConfigurationWizardPage_treeFillingConfigurationLabel); - treeFillingItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("TreeFillingConfiguration")); //$NON-NLS-1$ //$NON-NLS-2$ + treeFillingItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("TreeFillingConfiguration")); //$NON-NLS-1$ treeFillingItem.addSelectionListener(selectionListener); final MenuItem pasteEObjectItem = new MenuItem(menu, SWT.NONE); pasteEObjectItem.setText(Messages.RowConfigurationWizardPage_pasteConfigurationLabel); - pasteEObjectItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("PasteEObjectConfiguration")); //$NON-NLS-1$ //$NON-NLS-2$ + pasteEObjectItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("PasteEObjectConfiguration")); //$NON-NLS-1$ pasteEObjectItem.addSelectionListener(selectionListener); final MenuItem featureAxisItem = new MenuItem(menu, SWT.NONE); featureAxisItem.setText(Messages.RowConfigurationWizardPage_featureAxisLabel); - featureAxisItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("FeatureAxisConfiguration")); //$NON-NLS-1$ //$NON-NLS-2$ + featureAxisItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("FeatureAxisConfiguration")); //$NON-NLS-1$ featureAxisItem.addSelectionListener(selectionListener); final MenuItem featureValueFillingItem = new MenuItem(menu, SWT.NONE); featureValueFillingItem.setText(Messages.RowConfigurationWizardPage_eStructuralFeatureValueFillingConfigurationLabel); - featureValueFillingItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("EStructuralFeatureValueFillingConfiguration")); //$NON-NLS-1$ //$NON-NLS-2$ + featureValueFillingItem.setData(E_CLASS, NattableaxisconfigurationPackage.eINSTANCE.getEClassifier("EStructuralFeatureValueFillingConfiguration")); //$NON-NLS-1$ featureValueFillingItem.addSelectionListener(selectionListener); menu.setVisible(true); @@ -220,7 +220,7 @@ public class RowConfigurationWizardPage extends AbstractAxisConfigurationWizardP display.sleep(); } } catch (Throwable ex) { - System.out.println(ex); + Activator.log.error(ex); } } if (!display.isDisposed()) { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java index 0828162621b..80d43e244b5 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java @@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.nattable.utils; import java.io.Reader; import java.util.Map; +import org.eclipse.papyrus.editor.Activator; import org.eclipse.papyrus.infra.nattable.layerstack.RowHeaderHierarchicalLayerStack; import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager; import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager; @@ -168,9 +169,7 @@ public class PasteHelperUtils { if (minDepth > ((TreeFillingConfiguration) selectedRows.get(rowIndex)).getDepth()) { minDepth = ((TreeFillingConfiguration) selectedRows.get(rowIndex)).getDepth(); } - } else { - System.out.println(selectedRows.get(rowIndex)); - } + } } } -- cgit v1.2.3