Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2017-05-18 08:17:12 +0000
committervincent lorenzo2017-06-01 11:23:36 +0000
commit8fedec7f281f8cc332e5a0e8839cd4fc26ecd4d5 (patch)
treeab0bb6e8d47fc7dd0b1b83f63af2f33e9b935ef1 /plugins
parentbc0550d4724f5b49ba1bf6c85077973bb1841a44 (diff)
downloadorg.eclipse.papyrus-8fedec7f281f8cc332e5a0e8839cd4fc26ecd4d5.tar.gz
org.eclipse.papyrus-8fedec7f281f8cc332e5a0e8839cd4fc26ecd4d5.tar.xz
org.eclipse.papyrus-8fedec7f281f8cc332e5a0e8839cd4fc26ecd4d5.zip
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 <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java10
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelperUtils.java5
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateColumnStereotypePropertyMenuFactory.java4
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateRowStereotypePropertyMenuFactory.java4
8 files changed, 16 insertions, 17 deletions
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));
- }
+ }
}
}
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
index dad1753331d..d929e651a6a 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLMultiReferenceTextualCellEditorWithButtonConfiguration.java
@@ -215,4 +215,4 @@ public class UMLMultiReferenceTextualCellEditorWithButtonConfiguration implement
}
-}
+} \ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
index fe9bd2392c3..3932110ffe5 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/editor/DatatypeDialogCellEditor.java
@@ -124,7 +124,7 @@ public class DatatypeDialogCellEditor extends AbstractUMLMultiValueCellEditor {
*/
@Override
protected Object createDialog(final EObject realEditedObject, final EStructuralFeature realFeature, final Stereotype stereotype, final ResourceSet resourceSet) {
- return new EObjectTreeDialog(Display.getDefault().getActiveShell(), realEditedObject, realFeature, "DataType Edition") { // $NON-NLS-1$
+ return new EObjectTreeDialog(Display.getDefault().getActiveShell(), realEditedObject, realFeature, "DataType Edition") { //$NON-NLS-1$
@Override
protected void okPressed() {
super.okPressed();
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
index ca088ca0d9c..75e089db1a1 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/filter/configuration/UMLEnumerationEditorFilterConfiguration.java
@@ -225,7 +225,7 @@ public class UMLEnumerationEditorFilterConfiguration extends EEnumFilterCellEdit
return null;
}
IAxis iaxis = (IAxis) axis;
- CompoundCommand cc = new CompoundCommand("Set Filter Value Command");
+ CompoundCommand cc = new CompoundCommand("Set Filter Value Command"); //$NON-NLS-1$
NamedStyle keyStyle = getValueToMatchStyle(iaxis);
if (newValue instanceof Collection<?>) {
Collection<?> coll = (Collection<?>) newValue;
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
index 459d1549009..e8f51e3f1a2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/manager/cell/StereotypePropertyCellManager.java
@@ -274,7 +274,7 @@ public class StereotypePropertyCellManager extends UMLFeatureCellManager {
EStructuralFeature steApFeature = null;
if (prop != null) {
if (stereotypes.isEmpty()) {
- if (newValue == null || newValue.isEmpty() || newValue.equalsIgnoreCase(org.eclipse.papyrus.infra.nattable.utils.Constants.NOT_AVALAIBLE)) { // $NON-NLS-1$
+ if (newValue == null || newValue.isEmpty() || newValue.equalsIgnoreCase(org.eclipse.papyrus.infra.nattable.utils.Constants.NOT_AVALAIBLE)) {
// Don't apply the stereotype if there's no value to set.
return null;
}
@@ -382,6 +382,7 @@ public class StereotypePropertyCellManager extends UMLFeatureCellManager {
* @param tableManager
* the table manager
*/
+ @SuppressWarnings("unchecked")
@Override
public void setStringValue(Object columnElement, Object rowElement, String valueAsString, AbstractStringValueConverter valueSolver, Map<?, ?> sharedMap, INattableModelManager tableManager) {
// commented to fix bug 480894: [Table]pasting an empty string in a stereotype property colonne throws a java.lang.IllegalStateException
@@ -405,7 +406,6 @@ public class StereotypePropertyCellManager extends UMLFeatureCellManager {
final String postActionId = Constants.POST_ACTION_APPLY_STEREOTYPE_PREFIX + ((NamedElement) element).getQualifiedName();
// we register a special post actions to conclude the stereotype application
- @SuppressWarnings("unchecked")
final Collection<String> postActionIds = (Collection<String>) sharedMap.get(org.eclipse.papyrus.infra.nattable.utils.Constants.ADDITIONAL_POST_ACTIONS_TO_CONCLUDE_PASTE_KEY);
postActionIds.add(postActionId);
// we do the post action : we apply the streotype
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateColumnStereotypePropertyMenuFactory.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateColumnStereotypePropertyMenuFactory.java
index ec8709ff734..eeff9ae4daa 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateColumnStereotypePropertyMenuFactory.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateColumnStereotypePropertyMenuFactory.java
@@ -36,12 +36,12 @@ import org.eclipse.uml2.uml.Property;
public class CreateColumnStereotypePropertyMenuFactory extends AbstractCreateStereotypePropertyMenuFactory {
/** the label of the menu */
- public static final String MENU_LABEL = "Select Stereotype Properties Columns";
+ public static final String MENU_LABEL = "Select Stereotype Properties Columns"; //$NON-NLS-1$
/**
* the path of the icon to use for this menu
*/
- private static final String ICON_PATH = "/icons/stereotypePropertyColumn.gif";
+ private static final String ICON_PATH = "/icons/stereotypePropertyColumn.gif"; //$NON-NLS-1$
/**
*
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateRowStereotypePropertyMenuFactory.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateRowStereotypePropertyMenuFactory.java
index 205a377129a..208c22d808b 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateRowStereotypePropertyMenuFactory.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/menu/CreateRowStereotypePropertyMenuFactory.java
@@ -36,12 +36,12 @@ import org.eclipse.uml2.uml.Property;
public class CreateRowStereotypePropertyMenuFactory extends AbstractCreateStereotypePropertyMenuFactory {
/** the label of the menu */
- public static final String MENU_LABEL = "Select Stereotype Properties Rows";
+ public static final String MENU_LABEL = "Select Stereotype Properties Rows"; //$NON-NLS-1$
/**
* the path of the icon to use for this menu
*/
- private static final String ICON_PATH = "/icons/stereotypePropertyRow.gif";
+ private static final String ICON_PATH = "/icons/stereotypePropertyRow.gif"; //$NON-NLS-1$
/**
*

Back to the top