diff options
| author | Pierre-Charles David | 2015-08-18 12:34:27 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-08-19 08:50:59 +0000 |
| commit | ff658ab399e4c462eccc1483110d5a62c7ab2061 (patch) | |
| tree | 89051d974c2e194f0a7ac04cdf5a7d9de5725c67 | |
| parent | 9ed874c7757b6d3754558b5c59c72af19b40038f (diff) | |
| download | org.eclipse.sirius-ff658ab399e4c462eccc1483110d5a62c7ab2061.tar.gz org.eclipse.sirius-ff658ab399e4c462eccc1483110d5a62c7ab2061.tar.xz org.eclipse.sirius-ff658ab399e4c462eccc1483110d5a62c7ab2061.zip | |
[472057] Identify non-translatable strings with NON-NLS markers
Add NON-NLS markers to all literal strings (in the scope of this ticket)
which should not be translated, be they identifers, technical/internal
names (e.g. names of elements in our metamodels), file paths, etc.
Bug: 472057
Change-Id: Ie2d3948419cfe1995319001aa03c7d256fb8626b
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
563 files changed, 1366 insertions, 1533 deletions
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java index 4829b70545..5ccb924dbe 100644 --- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java +++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/src/org/eclipse/sirius/common/acceleo/aql/ide/proposal/AQLProposalProvider.java @@ -129,7 +129,7 @@ public class AQLProposalProvider implements IProposalProvider { queryEnvironment.registerEPackage(context.getCurrentSelected().eClass().getEPackage()); final Set<IType> potentialTypes = new LinkedHashSet<IType>(1); potentialTypes.add(new EClassifierType(queryEnvironment, context.getCurrentSelected().eClass())); - variableTypes.put("self", potentialTypes); + variableTypes.put("self", potentialTypes); //$NON-NLS-1$ } ExpressionTrimmer trimer = new ExpressionTrimmer(context.getTextSoFar()); diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/AQLConstants.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/AQLConstants.java index 952b80dcd9..fa16a64245 100644 --- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/AQLConstants.java +++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/AQLConstants.java @@ -20,7 +20,7 @@ public final class AQLConstants { /** * A suffix to explicit the use of the AQL evaluation engine. */ - public static final String AQL_PREFIX = "aql:"; + public static final String AQL_PREFIX = "aql:"; //$NON-NLS-1$ /** * This class should not be instantiated as it only contains constants. diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/ExpressionTrimmer.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/ExpressionTrimmer.java index 3daa8329e8..e45b32843f 100644 --- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/ExpressionTrimmer.java +++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/ExpressionTrimmer.java @@ -22,13 +22,13 @@ public class ExpressionTrimmer { * This represents the prefix of an Acceleo 3 expression. * */ - private static final String ACCELEO_EXPRESSION_PREFIX = "["; + private static final String ACCELEO_EXPRESSION_PREFIX = "["; //$NON-NLS-1$ /** * This represents the suffix of an Acceleo 3 expression. * */ - private static final String ACCELEO_EXPRESSION_SUFFIX = "/]"; + private static final String ACCELEO_EXPRESSION_SUFFIX = "/]"; //$NON-NLS-1$ private int removedFromStart; diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java index fff72f93e6..db0e1eef31 100644 --- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java +++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/api/TypesUtil.java @@ -62,7 +62,7 @@ public final class TypesUtil { if (selfTyping.size() == 0) { selfTyping.add(new ClassType(queryEnvironment, EObject.class)); } - variableTypes.put("self", selfTyping); + variableTypes.put("self", selfTyping); //$NON-NLS-1$ for (Entry<String, VariableType> varDef : context.getVariables().entrySet()) { VariableType typeName = varDef.getValue(); diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java index 2f8a4e9c13..a084fc8e8d 100644 --- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java +++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java @@ -180,7 +180,7 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter { this.javaExtensions.reloadIfNeeded(); String expression = new ExpressionTrimmer(fullExpression).getExpression(); Map<String, Object> variables = getVariables(); - variables.put("self", target); + variables.put("self", target); //$NON-NLS-1$ AstResult build; try { build = parsedExpressions.get(expression); @@ -242,7 +242,7 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter { if (eClassifierType.getType() != null && eClassifierType.getType().getName() != null) { String typeName = eClassifierType.getType().getName(); if (eClassifierType.getType().getEPackage() != null && eClassifierType.getType().getEPackage().getName() != null) { - typeName = eClassifierType.getType().getEPackage().getName() + "." + typeName; + typeName = eClassifierType.getType().getEPackage().getName() + "." + typeName; //$NON-NLS-1$ } classifierNames.add(typeName); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/SiriusTransPlugin.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/SiriusTransPlugin.java index 47b37a5893..1aed288e82 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/SiriusTransPlugin.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/SiriusTransPlugin.java @@ -57,7 +57,7 @@ public final class SiriusTransPlugin extends EMFPlugin { * @generated */ // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.sirius.common.ui"; + public static final String PLUGIN_ID = "org.eclipse.sirius.common.ui"; //$NON-NLS-1$ /** * Singleton instance. diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java index c6497c9ed0..e25a4c5524 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java @@ -337,7 +337,7 @@ public class FeatureEditorDialog extends Dialog { try { Object value = EcoreUtil.createFromString((EDataType) eClassifier, choiceText.getText()); children.add(value); - choiceText.setText(""); + choiceText.setText(""); //$NON-NLS-1$ featureTableViewer.refresh(); featureTableViewer.setSelection(new StructuredSelection(value)); event.doit = false; @@ -345,7 +345,7 @@ public class FeatureEditorDialog extends Dialog { // Ignore } } else if (event.character == '\33') { - choiceText.setText(""); + choiceText.setText(""); //$NON-NLS-1$ event.doit = false; } } @@ -399,7 +399,7 @@ public class FeatureEditorDialog extends Dialog { Object value = EcoreUtil.createFromString((EDataType) eClassifier, choiceText.getText()); if (!unique || !children.contains(value)) { children.add(value); - choiceText.setText(""); + choiceText.setText(""); //$NON-NLS-1$ } featureTableViewer.refresh(); featureTableViewer.setSelection(new StructuredSelection(value)); diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java index 71f0fae645..9d16de715b 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java @@ -127,7 +127,7 @@ public class QuickOutlineControl extends PopupDialog implements IInformationCont result = wordMatches(labelText); } String filterText = filteredTree.getFilterControl().getText(); - if (!filterText.equals("") && !filterText.equals("*")) { + if (!filterText.equals("") && !filterText.equals("*")) { //$NON-NLS-1$ //$NON-NLS-2$ EObject eObj = (EObject) element; boolean match; for (EAttribute attribute : eObj.eClass().getEAllAttributes()) { diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingContentProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingContentProvider.java index b3672037e4..38f3c91870 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingContentProvider.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingContentProvider.java @@ -63,10 +63,10 @@ public class GroupingContentProvider implements ITreeContentProvider { Configuration(IPreferenceStore store) { super(store); - bindInt(CommonPreferencesConstants.PREF_GROUP_SIZE, "groupSize"); - bindInt(CommonPreferencesConstants.PREF_GROUP_TRIGGER, "groupTrigger"); - bindBoolean(CommonPreferencesConstants.PREF_GROUP_ENABLE, "groupEnabled"); - bindBoolean(CommonPreferencesConstants.PREF_GROUP_BY_CONTAINING_FEATURE, "groupByContainingFeature"); + bindInt(CommonPreferencesConstants.PREF_GROUP_SIZE, "groupSize"); //$NON-NLS-1$ + bindInt(CommonPreferencesConstants.PREF_GROUP_TRIGGER, "groupTrigger"); //$NON-NLS-1$ + bindBoolean(CommonPreferencesConstants.PREF_GROUP_ENABLE, "groupEnabled"); //$NON-NLS-1$ + bindBoolean(CommonPreferencesConstants.PREF_GROUP_BY_CONTAINING_FEATURE, "groupByContainingFeature"); //$NON-NLS-1$ } } @@ -217,7 +217,7 @@ public class GroupingContentProvider implements ITreeContentProvider { for (List<Object> partItem : partition) { GroupingItem currentGroup; if (structuralFeature instanceof EStructuralFeature) { - currentGroup = new GroupingItem(currentOffset, parent, new ArrayList<Object>(partItem), " " + ((EStructuralFeature) structuralFeature).getName()); + currentGroup = new GroupingItem(currentOffset, parent, new ArrayList<Object>(partItem), " " + ((EStructuralFeature) structuralFeature).getName()); //$NON-NLS-1$ } else { currentGroup = new GroupingItem(currentOffset, parent, new ArrayList<Object>(partItem)); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingItem.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingItem.java index 6dbcb2cf05..a4ee619c68 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingItem.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/navigator/GroupingItem.java @@ -59,7 +59,7 @@ public class GroupingItem implements CommonItem, ItemDecorator { * Children */ public GroupingItem(int offset, Object parent, Collection<Object> children) { - this(offset, parent, children, ""); + this(offset, parent, children, ""); //$NON-NLS-1$ } /** @@ -109,7 +109,7 @@ public class GroupingItem implements CommonItem, ItemDecorator { if (children != null && children.size() > 0) { childrenSize = children.size() - 1; } - return "[" + fOffset + ".." + (fOffset + childrenSize) + "]" + labelSuffix; + return "[" + fOffset + ".." + (fOffset + childrenSize) + "]" + labelSuffix; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** @@ -119,7 +119,7 @@ public class GroupingItem implements CommonItem, ItemDecorator { */ public Image getImage() { if (imageCache == null) { - imageCache = SiriusTransPlugin.INSTANCE.getBundledImage(SiriusTransPlugin.PLUGIN_ID + "/icons/ArrayPartition.gif"); + imageCache = SiriusTransPlugin.INSTANCE.getBundledImage(SiriusTransPlugin.PLUGIN_ID + "/icons/ArrayPartition.gif"); //$NON-NLS-1$ } return imageCache; } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfiler2ViewLabelProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfiler2ViewLabelProvider.java index db6cae39d0..c11b250db8 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfiler2ViewLabelProvider.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfiler2ViewLabelProvider.java @@ -136,7 +136,7 @@ public class TimeProfiler2ViewLabelProvider extends LabelProvider implements ITa */ private Font getFontFromValue(final boolean bold) { if (!fontCache.containsKey(Boolean.valueOf(bold))) { - fontCache.put(Boolean.valueOf(bold), new Font(Display.getDefault(), "ARIAL", 8, !bold ? SWT.NORMAL : SWT.BOLD)); + fontCache.put(Boolean.valueOf(bold), new Font(Display.getDefault(), "ARIAL", 8, !bold ? SWT.NORMAL : SWT.BOLD)); //$NON-NLS-1$ } return fontCache.get(Boolean.valueOf(bold)); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java index a2a709dd41..54e662d34f 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java @@ -170,30 +170,17 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener { viewer.setInput(TreeItemWrapper.ROOT_ITEM); } - /** - * {@inheritDoc} - * - * @see org.eclipse.ui.part.WorkbenchPart#setFocus() - */ @Override public void setFocus() { viewer.getControl().setFocus(); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.common.tools.api.profiler.ProfilerListener#taskStarted(org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent) - */ + @Override public void taskStarted(final ProfilerEvent event) { // do nothing. } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.common.tools.api.profiler.ProfilerListener#taskStopped(org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent) - */ + @Override public void taskStopped(final ProfilerEvent event) { // do nothing. } @@ -226,7 +213,7 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener { * Create the context menu. */ private void createContextMenu() { - final MenuManager menuManager = new MenuManager("#PopupMenu"); + final MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuManager.setRemoveAllWhenShown(true); menuManager.addMenuListener(new IMenuListener() { public void menuAboutToShow(final IMenuManager manager) { @@ -254,11 +241,7 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener { getViewSite().getActionBars().getToolBarManager().add(this.printAction); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.common.tools.api.profiler.ProfilerListener#profilerReinited(org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent) - */ + @Override public void profilerReinited(final ProfilerEvent event) { this.viewer.refresh(); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java index 49d3cf85d3..099e98615d 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java @@ -47,7 +47,7 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener { /** * ID for the view. */ - public static final String ID = "org.eclipse.sirius.common.ui.view.timeProfiler"; + public static final String ID = "org.eclipse.sirius.common.ui.view.timeProfiler"; //$NON-NLS-1$ /** The tree viewer. */ private TreeViewer viewer; @@ -289,7 +289,7 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener { * Create the context menu. */ private void createContextMenu() { - final MenuManager menuManager = new MenuManager("#PopupMenu"); + final MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuManager.setRemoveAllWhenShown(true); menuManager.addMenuListener(new IMenuListener() { public void menuAboutToShow(final IMenuManager manager) { diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialog.java index 13be794f23..b019e8fd5f 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialog.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialog.java @@ -234,7 +234,7 @@ public class WorkspaceResourceDialog extends Dialog { */ @Override public boolean select(final Viewer theViewer, final Object parentElement, final Object element) { - if (extensions == null || extensions.size() == 0 || extensions.contains("*")) { + if (extensions == null || extensions.size() == 0 || extensions.contains("*")) { //$NON-NLS-1$ return true; } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java index a1ada8cc7e..aff8dd4543 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java @@ -39,7 +39,7 @@ public class EObjectPaneBasedSelectionWizard extends Wizard { /** "Please select an element". */ public static final String WIZARD_GENERIC_DIALOG_MESSAGE = "Please select an element"; - private static final String EOBJECT_PANE_BASED_SELECTION_WIZARD_PAGE_NAME = "page"; + private static final String EOBJECT_PANE_BASED_SELECTION_WIZARD_PAGE_NAME = "page"; //$NON-NLS-1$ private EObjectPaneBasedSelectionWizardPage page; @@ -99,11 +99,6 @@ public class EObjectPaneBasedSelectionWizard extends Wizard { page.init(objects, preSelectedObjects); } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ @Override public boolean performFinish() { return true; diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java index 14178e22a6..d7e3f904bf 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java @@ -33,7 +33,7 @@ public class EObjectSelectionWizard extends Wizard { /** "Please select an element". */ public static final String WIZARD_GENERIC_DIALOG_MESSAGE = "Please select an element"; - private static final String EOBJECT_SELECTION_WIZARD_PAGE_NAME = "page"; + private static final String EOBJECT_SELECTION_WIZARD_PAGE_NAME = "page"; //$NON-NLS-1$ private EObjectSelectionWizardPage page; diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java index 1800935ee3..ff83610539 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java @@ -139,11 +139,6 @@ public class ModelElementChooserDialog extends Dialog { return buttonBar; } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.dialogs.Dialog#close() - */ @Override public boolean close() { this.myEditingDomain.dispose(); @@ -205,11 +200,7 @@ public class ModelElementChooserDialog extends Dialog { private ITreeContentProvider myWorkbenchContentProvider = new WorkbenchContentProvider(); - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ + @Override public Object[] getChildren(final Object parentElement) { Object[] result = myWorkbenchContentProvider.getChildren(parentElement); if (result == null || result.length <= 0) { @@ -226,11 +217,7 @@ public class ModelElementChooserDialog extends Dialog { return result; } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ + @Override public Object getParent(final Object element) { Object parent = myWorkbenchContentProvider.getParent(element); diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectSelectionFilter.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectSelectionFilter.java index 0e3e81bf99..78d534b4ab 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectSelectionFilter.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectSelectionFilter.java @@ -48,12 +48,6 @@ public class EObjectSelectionFilter extends ViewerFilter { } } - /** - * {@inheritDoc} - * - * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, - * java.lang.Object, java.lang.Object) - */ @Override public boolean select(final Viewer viewer, final Object parentElement, final Object element) { @@ -103,16 +97,16 @@ public class EObjectSelectionFilter extends ViewerFilter { private StringMatcher getStringMatcher() { String computedRegExp = regExp; if (regExp == null) { - computedRegExp = ""; + computedRegExp = ""; //$NON-NLS-1$ } // If the regular expression ends with a space, we have to use the exact // value of the given expreg - if (computedRegExp.endsWith(" ")) { + if (computedRegExp.endsWith(" ")) { //$NON-NLS-1$ computedRegExp = computedRegExp.substring(0, computedRegExp.lastIndexOf(' ')); } // At the end we add a star to make 'XYZ' recognized by the 'X' // expreg (as in quick outline for example) - computedRegExp = computedRegExp + "*"; + computedRegExp = computedRegExp + "*"; //$NON-NLS-1$ return new StringMatcher(computedRegExp, true, false); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java index 53a5655911..a722c15a39 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java @@ -619,7 +619,7 @@ public final class SWTUtil { Shell shell = new Shell(Display.getCurrent()); Label label = new Label(shell, SWT.NONE); GC gc = new GC(label); - height = gc.textExtent("Some text").y; + height = gc.textExtent("Some text").y; //$NON-NLS-1$ gc.dispose(); label.dispose(); shell.dispose(); @@ -689,7 +689,7 @@ public final class SWTUtil { if (currentWidth / nbLinesAvailable > maxWidth) { int length = textValue.length() - 4; while (length > 0 && result == null) { - String newText = textValue.substring(0, length) + "..."; + String newText = textValue.substring(0, length) + "..."; //$NON-NLS-1$ currentWidth = gc.textExtent(newText).x; // We remove 1 to the maxWidth because there is // sometimes characters that takes less or more place. diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java index 033ae5dad7..435b160fbd 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java @@ -63,7 +63,7 @@ import com.google.common.collect.Lists; */ public class SelectFilesWizardPage extends WizardPage { - private static final String JOKER = "*"; + private static final String JOKER = "*"; //$NON-NLS-1$ // Constants private static final int SELECTION_WIDGET_WIDTH = 400; diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java index 65f9996d4d..c00350e8e7 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java @@ -39,22 +39,18 @@ import com.google.common.collect.Sets; */ public class FeatureProposalProvider implements IProposalProvider { - private static final String SEPARATOR_1 = ":"; + private static final String SEPARATOR_1 = ":"; //$NON-NLS-1$ - private static final String SEPARATOR_2 = " - "; + private static final String SEPARATOR_2 = " - "; //$NON-NLS-1$ - private static final String SEPARATOR_3 = "[0..*]"; + private static final String SEPARATOR_3 = "[0..*]"; //$NON-NLS-1$ - /** - * {@inheritDoc} - */ + @Override public ContentProposal getNewEmtpyExpression() { return new ContentProposal(FeatureInterpreter.PREFIX, FeatureInterpreter.PREFIX, "New feature access expression.", FeatureInterpreter.PREFIX.length()); } - /** - * {@inheritDoc} - */ + @Override public List<ContentProposal> getProposals(IInterpreter interpreter, ContentContext context) { final List<ContentProposal> proposals; if (context == null || !(interpreter instanceof FeatureInterpreter)) { @@ -84,9 +80,7 @@ public class FeatureProposalProvider implements IProposalProvider { return proposals; } - /** - * {@inheritDoc} - */ + @Override public List<ContentProposal> getProposals(IInterpreter interpreter, ContentInstanceContext context) { final List<ContentProposal> proposals; if (context == null || !(interpreter instanceof FeatureInterpreter)) { @@ -141,7 +135,7 @@ public class FeatureProposalProvider implements IProposalProvider { String eAllContentsFeatureName = FeatureInterpreter.DEFAULT_FEATURE_NAMES[2]; if (eAllContentsFeatureName.startsWith(featureNamePrefix)) { - String displayedName = eAllContentsFeatureName + SEPARATOR_1 + "TreeIterator" + SEPARATOR_2 + eObjectName; + String displayedName = eAllContentsFeatureName + SEPARATOR_1 + "TreeIterator" + SEPARATOR_2 + eObjectName; //$NON-NLS-1$ proposals.add(new ContentProposal(eAllContentsFeatureName, displayedName, displayedName)); } @@ -161,9 +155,9 @@ public class FeatureProposalProvider implements IProposalProvider { for (EStructuralFeature eStructuralFeature : currentElementType.getEAllStructuralFeatures()) { if (eStructuralFeature.getName().startsWith(featureNamePrefix)) { String displayedName = eStructuralFeature.getName() - + (eStructuralFeature.isMany() ? "[" + eStructuralFeature.getLowerBound() + ".." - + (eStructuralFeature.getUpperBound() == -1 ? "*" : eStructuralFeature.getUpperBound()) + "]" : "") - + (eStructuralFeature.getEType() != null ? SEPARATOR_1 + eStructuralFeature.getEType().getName() : "") + SEPARATOR_2 + + (eStructuralFeature.isMany() ? "[" + eStructuralFeature.getLowerBound() + ".." //$NON-NLS-1$//$NON-NLS-2$ + + (eStructuralFeature.getUpperBound() == -1 ? "*" : eStructuralFeature.getUpperBound()) + "]" : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + (eStructuralFeature.getEType() != null ? SEPARATOR_1 + eStructuralFeature.getEType().getName() : "") + SEPARATOR_2 //$NON-NLS-1$ + eStructuralFeature.getEContainingClass().getName(); proposals.add(new ContentProposal(eStructuralFeature.getName(), displayedName, displayedName)); } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java index 77b9f905bd..001f518a04 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java @@ -81,9 +81,7 @@ public class ServiceProposalProvider implements IProposalProvider { return proposals; } - /** - * {@inheritDoc} - */ + @Override public List<ContentProposal> getProposals(IInterpreter interpreter, ContentInstanceContext context) { final List<ContentProposal> proposals; if (context == null || !(interpreter instanceof ServiceInterpreter)) { @@ -181,7 +179,7 @@ public class ServiceProposalProvider implements IProposalProvider { // Add a "." to each proposal for (ContentProposal contentProposal : variableProposals) { proposals.add(new ContentProposal(contentProposal.getProposal() + ServiceInterpreter.RECEIVER_SEPARATOR, contentProposal.getProposal() + ServiceInterpreter.RECEIVER_SEPARATOR - + ": " + contentProposal.getInformation(), contentProposal.getInformation(), contentProposal.getCursorPosition() + 1)); + + ": " + contentProposal.getInformation(), contentProposal.getInformation(), contentProposal.getCursorPosition() + 1)); //$NON-NLS-1$ } } } @@ -197,15 +195,15 @@ public class ServiceProposalProvider implements IProposalProvider { Iterator<String> iterator = parametersTypes.iterator(); if (iterator.hasNext()) { iterator.next(); - serviceName += "("; + serviceName += "("; //$NON-NLS-1$ while (iterator.hasNext()) { String parameter = iterator.next(); serviceName += parameter; if (iterator.hasNext()) { - serviceName += ", "; + serviceName += ", "; //$NON-NLS-1$ } } - serviceName += ")"; + serviceName += ")"; //$NON-NLS-1$ } serviceNames.add(serviceName); diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java index ef27fe0a37..b7d60a88bb 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java @@ -68,9 +68,7 @@ public class VariableProposalProvider implements IProposalProvider { return proposals; } - /** - * {@inheritDoc} - */ + @Override public List<ContentProposal> getProposals(IInterpreter interpreter, ContentInstanceContext context) { final List<ContentProposal> proposals; if (context == null || !(interpreter instanceof VariableInterpreter)) { @@ -130,7 +128,7 @@ public class VariableProposalProvider implements IProposalProvider { String variableName = entry.getKey(); String variableType = entry.getValue(); if (variableName.startsWith(variableNamePrefix)) { - proposals.add(new ContentProposal(variableName, variableName + ": " + variableType, variableType)); + proposals.add(new ContentProposal(variableName, variableName + ": " + variableType, variableType)); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/util/ISaveDialogExtensionDescriptor.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/util/ISaveDialogExtensionDescriptor.java index 7a0f9022cb..837784d1a3 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/util/ISaveDialogExtensionDescriptor.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/util/ISaveDialogExtensionDescriptor.java @@ -29,7 +29,7 @@ public class ISaveDialogExtensionDescriptor { /** * Name of the attribute corresponding to the contributed class's path. */ - public static final String SAVE_DIALOG_EXTENSION_CONTRIBUTED_CLASS_NAME = "class"; + public static final String SAVE_DIALOG_EXTENSION_CONTRIBUTED_CLASS_NAME = "class"; //$NON-NLS-1$ /** * Configuration element of this descriptor . diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/DslCommonPlugin.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/DslCommonPlugin.java index 090b1e867f..e377307a93 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/DslCommonPlugin.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/DslCommonPlugin.java @@ -33,7 +33,10 @@ import org.osgi.framework.BundleContext; public class DslCommonPlugin extends EMFPlugin { /** The plugin id. */ - public static final String PLUGIN_ID = "org.eclipse.sirius.common"; + public static final String PLUGIN_ID = "org.eclipse.sirius.common"; //$NON-NLS-1$ + + /** Keep track of the singleton.. */ + public static final DslCommonPlugin INSTANCE = new DslCommonPlugin(); /** The profiler. */ public static final TimeProfiler PROFILER = new TimeProfiler2(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/constant/CommonPreferencesConstants.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/constant/CommonPreferencesConstants.java index 182b94fde3..8df1e9e6b2 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/constant/CommonPreferencesConstants.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/constant/CommonPreferencesConstants.java @@ -23,32 +23,32 @@ public interface CommonPreferencesConstants { * Says if the file edit validation should be done as soon as a command is * executed or not. */ - String PREF_DEFENSIVE_EDIT_VALIDATION = "DEFENSIVE_VALIDATE_EDIT"; + String PREF_DEFENSIVE_EDIT_VALIDATION = "DEFENSIVE_VALIDATE_EDIT"; //$NON-NLS-1$ /** * Says if the profiling in the Acceleo console should be activated or not. */ - String PREF_TRACE_ON = "REFRESH_PROFILING"; + String PREF_TRACE_ON = "REFRESH_PROFILING"; //$NON-NLS-1$ /** * Defines the enable state of grouping content. */ - String PREF_GROUP_ENABLE = "GROUP_ENABLE"; + String PREF_GROUP_ENABLE = "GROUP_ENABLE"; //$NON-NLS-1$ /** * Says if the grouping strategy uses the containing feature instead of the * basic hierarchy. */ - String PREF_GROUP_BY_CONTAINING_FEATURE = "GROUP_BY_CONTAINING_FEATURE"; + String PREF_GROUP_BY_CONTAINING_FEATURE = "GROUP_BY_CONTAINING_FEATURE"; //$NON-NLS-1$ /** * Defines the size of children that triggers the group in sub block. */ - String PREF_GROUP_TRIGGER = "GROUP_TRIGGER"; + String PREF_GROUP_TRIGGER = "GROUP_TRIGGER"; //$NON-NLS-1$ /** * Defines the size of elements contained in a group. */ - String PREF_GROUP_SIZE = "GROUP_SIZE"; + String PREF_GROUP_SIZE = "GROUP_SIZE"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java index 1a5f8db0ed..d0b6f27bac 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java @@ -78,7 +78,7 @@ public class FileStatusPrecommitListener extends ResourceSetListenerImpl { */ @Override public Command transactionAboutToCommit(final ResourceSetChangeEvent event) throws RollbackException { - final boolean defensiveEditValidation = Platform.getPreferencesService().getBoolean("org.eclipse.sirius.common.ui", CommonPreferencesConstants.PREF_DEFENSIVE_EDIT_VALIDATION, true, null); + final boolean defensiveEditValidation = Platform.getPreferencesService().getBoolean("org.eclipse.sirius.common.ui", CommonPreferencesConstants.PREF_DEFENSIVE_EDIT_VALIDATION, true, null); //$NON-NLS-1$ final Command cmd = super.transactionAboutToCommit(event); if (defensiveEditValidation) { final Set<Resource> changedRes = Sets.newLinkedHashSet(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/IEditingDomainFactory.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/IEditingDomainFactory.java index 7f6103f602..3bb4e3f118 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/IEditingDomainFactory.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/IEditingDomainFactory.java @@ -23,11 +23,11 @@ import org.eclipse.sirius.common.tools.DslCommonPlugin; public interface IEditingDomainFactory extends Factory { /** . */ - String EXTENSION_POINT_ID = DslCommonPlugin.PLUGIN_ID + ".editingDomainFactory"; + String EXTENSION_POINT_ID = DslCommonPlugin.PLUGIN_ID + ".editingDomainFactory"; //$NON-NLS-1$ /** . */ - String EXTENSION_POINT_ELEMENT = "editingDomainFactory"; + String EXTENSION_POINT_ELEMENT = "editingDomainFactory"; //$NON-NLS-1$ /** . */ - String EXTENSION_POINT_CLASS_ATTRIBUTE = "class"; + String EXTENSION_POINT_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java index ef362596d9..d1c6f6394f 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java @@ -57,13 +57,13 @@ public final class CompoundInterpreter implements IInterpreter, IProposalProvide * Name of the extension point attribute that contains our qualified class * name. */ - private static final String ENGINE_ATTRIBUTE_CLASS = "interpreterProviderClass"; + private static final String ENGINE_ATTRIBUTE_CLASS = "interpreterProviderClass"; //$NON-NLS-1$ /** The extension point. */ - private static final String INTERPRETER_EXTENSION_POINT = "org.eclipse.sirius.common.expressionInterpreter"; + private static final String INTERPRETER_EXTENSION_POINT = "org.eclipse.sirius.common.expressionInterpreter"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "expressionInterpreterProvider"; + private static final String TAG_ENGINE = "expressionInterpreterProvider"; //$NON-NLS-1$ /** The registered interpreters. */ private final Map<IInterpreterProvider, IInterpreter> providers; diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/EPackageLoadingCallback.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/EPackageLoadingCallback.java index f3086250c0..28bf528989 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/EPackageLoadingCallback.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/EPackageLoadingCallback.java @@ -120,11 +120,11 @@ public interface EPackageLoadingCallback { @Override public String toString() { - String result = ""; + String result = ""; //$NON-NLS-1$ if (isBundle) { - result += "bundle :"; + result += "bundle :"; //$NON-NLS-1$ } else { - result += "project :"; + result += "project :"; //$NON-NLS-1$ } result += symbolicName; return result; diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreter.java index 0db9b86cfe..04090e7971 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreter.java @@ -31,7 +31,7 @@ public interface IInterpreter { * * @since 0.9.0 * */ - String FILES = "files"; + String FILES = "files"; //$NON-NLS-1$ /** * Returns <code>true</code> if this interpreter is able to evaluate the diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterSiriusVariables.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterSiriusVariables.java index b42d9448e9..872f55bcde 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterSiriusVariables.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterSiriusVariables.java @@ -19,75 +19,75 @@ package org.eclipse.sirius.common.tools.api.interpreter; public interface IInterpreterSiriusVariables { /** "view". */ - String VIEW = "view"; + String VIEW = "view"; //$NON-NLS-1$ /** "viewpoint". */ - String VIEWPOINT = "viewpoint"; + String VIEWPOINT = "viewpoint"; //$NON-NLS-1$ // TODOMCH this should move in diagram plug-in when mm separation will be // done /** "diagram". */ - String DIAGRAM = "diagram"; + String DIAGRAM = "diagram"; //$NON-NLS-1$ // FIXME LRE this should move in diagram plug-in when mm separation will be // done /** "diagram". */ - String TABLE = "table"; + String TABLE = "table"; //$NON-NLS-1$ /** "viewPoint". */ - String VIEWPOINT_2 = "viewPoint"; + String VIEWPOINT_2 = "viewPoint"; //$NON-NLS-1$ /** "element". */ - String ELEMENT = "element"; + String ELEMENT = "element"; //$NON-NLS-1$ /** "source". */ - String SOURCE = "source"; + String SOURCE = "source"; //$NON-NLS-1$ /** "preSource". */ - String SOURCE_PRE = "preSource"; + String SOURCE_PRE = "preSource"; //$NON-NLS-1$ /** "sourceView". */ - String SOURCE_VIEW = "sourceView"; + String SOURCE_VIEW = "sourceView"; //$NON-NLS-1$ /** "preSourceView". */ - String SOURCE_VIEW_PRE = "preSourceView"; + String SOURCE_VIEW_PRE = "preSourceView"; //$NON-NLS-1$ /** "target". */ - String TARGET = "target"; + String TARGET = "target"; //$NON-NLS-1$ /** "preTarget". */ - String TARGET_PRE = "preTarget"; + String TARGET_PRE = "preTarget"; //$NON-NLS-1$ /** Target view. */ - String TARGET_VIEW = "targetView"; + String TARGET_VIEW = "targetView"; //$NON-NLS-1$ /** "preTargetView". */ - String TARGET_VIEW_PRE = "preTargetView"; + String TARGET_VIEW_PRE = "preTargetView"; //$NON-NLS-1$ /** "targetSemanticNode". */ - String TARGET_SEMANTIC_NODE = "targetSemanticNode"; + String TARGET_SEMANTIC_NODE = "targetSemanticNode"; //$NON-NLS-1$ /** "container". */ - String CONTAINER = "container"; + String CONTAINER = "container"; //$NON-NLS-1$ /** "oldContainer". */ - String CONTAINER_OLD = "oldContainer"; + String CONTAINER_OLD = "oldContainer"; //$NON-NLS-1$ /** "newContainer". */ - String CONTAINER_NEW = "newContainer"; + String CONTAINER_NEW = "newContainer"; //$NON-NLS-1$ /** "containerView". */ - String CONTAINER_VIEW = "containerView"; + String CONTAINER_VIEW = "containerView"; //$NON-NLS-1$ /** "newViewContainer". */ - String CONTAINER_VIEW_NEW = "newViewContainer"; + String CONTAINER_VIEW_NEW = "newViewContainer"; //$NON-NLS-1$ /** "copiedView". */ - String COPIED_VIEW = "copiedView"; + String COPIED_VIEW = "copiedView"; //$NON-NLS-1$ /** "copiedElement". */ - String COPIED_ELEMENT = "copiedElement"; + String COPIED_ELEMENT = "copiedElement"; //$NON-NLS-1$ /** "root" representation root element. */ - String ROOT = "root"; + String ROOT = "root"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterStatus.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterStatus.java index 936f20076d..ec55587c89 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterStatus.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/IInterpreterStatus.java @@ -24,12 +24,12 @@ public interface IInterpreterStatus { /** * Status severity : warning. */ - String WARNING = "warning"; + String WARNING = "warning"; //$NON-NLS-1$ /** * Status severity : error. */ - String ERROR = "error"; + String ERROR = "error"; //$NON-NLS-1$ /** * Returns the names of all possible types for the target of the evaluated diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java index 1e3cde3b49..201031baaf 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/JavaExtensionsManager.java @@ -53,7 +53,7 @@ import com.google.common.collect.Sets; */ public final class JavaExtensionsManager { - private static final String WORKSPACE_SEPARATOR = "/"; + private static final String WORKSPACE_SEPARATOR = "/"; //$NON-NLS-1$ private static final Set<String> JAVA_SERVICES_BUNDLES_WHITE_LIST = Sets.newHashSet(DslCommonPlugin.PLUGIN_ID); @@ -347,7 +347,7 @@ public final class JavaExtensionsManager { * regarding target platforms introduced in EMF 2.9. */ try { - Method computePlatformURIMap = EcorePlugin.class.getMethod("computePlatformURIMap", Boolean.TYPE); + Method computePlatformURIMap = EcorePlugin.class.getMethod("computePlatformURIMap", Boolean.TYPE); //$NON-NLS-1$ result = (Map<URI, URI>) computePlatformURIMap.invoke(null, true); } catch (NoSuchMethodException e) { /* @@ -385,11 +385,11 @@ public final class JavaExtensionsManager { * supposed to be the root element. */ if (!genModelURI.hasFragment()) { - genModelURI = genModelURI.appendFragment("/"); + genModelURI = genModelURI.appendFragment("/"); //$NON-NLS-1$ } EObject genModel = set.getEObject(genModelURI, true); - if (genModel != null && genModel.eClass().getEPackage() != null && "GenModel".equals(genModel.eClass().getName()) && "genmodel".equals(genModel.eClass().getEPackage().getName())) { - Collection<EObject> genPackages = (Collection<EObject>) genModel.eGet(genModel.eClass().getEStructuralFeature("genPackages")); + if (genModel != null && genModel.eClass().getEPackage() != null && "GenModel".equals(genModel.eClass().getName()) && "genmodel".equals(genModel.eClass().getEPackage().getName())) { //$NON-NLS-1$ //$NON-NLS-2$ + Collection<EObject> genPackages = (Collection<EObject>) genModel.eGet(genModel.eClass().getEStructuralFeature("genPackages")); //$NON-NLS-1$ collectEPackages(ecorePackages, genPackages); } @@ -399,11 +399,11 @@ public final class JavaExtensionsManager { private void collectEPackages(Map<String, EPackage> ecorePackages, Collection<EObject> genPackages) { for (EObject genPackage : genPackages) { - Object ePak = genPackage.eGet(genPackage.eClass().getEStructuralFeature("ecorePackage")); + Object ePak = genPackage.eGet(genPackage.eClass().getEStructuralFeature("ecorePackage")); //$NON-NLS-1$ if (ePak instanceof EPackage && !StringUtil.isEmpty(((EPackage) ePak).getNsURI())) { ecorePackages.put(((EPackage) ePak).getNsURI(), (EPackage) ePak); } - Collection<EObject> subGenPackages = (Collection<EObject>) genPackage.eGet(genPackage.eClass().getEStructuralFeature("nestedGenPackages")); + Collection<EObject> subGenPackages = (Collection<EObject>) genPackage.eGet(genPackage.eClass().getEStructuralFeature("nestedGenPackages")); //$NON-NLS-1$ collectEPackages(ecorePackages, subGenPackages); } } @@ -448,7 +448,7 @@ public final class JavaExtensionsManager { * Extension. */ public void addImport(String classQualifiedName) { - if (classQualifiedName != null && classQualifiedName.contains(".")) { + if (classQualifiedName != null && classQualifiedName.contains(".")) { //$NON-NLS-1$ this.imports.add(classQualifiedName); this.shouldLoadServices = true; } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/TypeName.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/TypeName.java index 931f58ea44..bcc4d32aea 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/TypeName.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/TypeName.java @@ -35,14 +35,14 @@ public final class TypeName { /** * A singleton TypeName for any java.lang.Object. */ - public static final TypeName ANY_TYPENAME = new TypeName("ecore.EJavaObject"); + public static final TypeName ANY_TYPENAME = new TypeName("ecore.EJavaObject"); //$NON-NLS-1$ /** * A singleton TypeName for any EObject. */ - public static final TypeName EOBJECT_TYPENAME = new TypeName("ecore.EObject"); + public static final TypeName EOBJECT_TYPENAME = new TypeName("ecore.EObject"); //$NON-NLS-1$ - private static final String SEPARATOR = "."; + private static final String SEPARATOR = "."; //$NON-NLS-1$ private final String typeName; @@ -135,9 +135,9 @@ public final class TypeName { public static TypeName fromString(String typeName) { TypeName result = ANY_TYPENAME; if (!StringUtil.isEmpty(typeName)) { - if ("ecore.EJavaObject".equals(typeName) || "EJavaObject".equals(typeName)) { + if ("ecore.EJavaObject".equals(typeName) || "EJavaObject".equals(typeName)) { //$NON-NLS-1$ //$NON-NLS-2$ result = ANY_TYPENAME; - } else if ("ecore.EObject".equals(typeName) || "EObject".equals(typeName)) { + } else if ("ecore.EObject".equals(typeName) || "EObject".equals(typeName)) { //$NON-NLS-1$ //$NON-NLS-2$ result = EOBJECT_TYPENAME; } else { result = new TypeName(typeName.trim()); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/VariableType.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/VariableType.java index d0c6686e5b..2429928629 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/VariableType.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/VariableType.java @@ -165,6 +165,6 @@ public final class VariableType { @Override public String toString() { - return "[" + Joiner.on(',').join(this.types) + "]"; + return "[" + Joiner.on(',').join(this.types) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java index 3d05210305..b83bb30fff 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java @@ -258,11 +258,11 @@ public class TimeProfiler { final Iterator<ProfilerTask> it = times.keySet().iterator(); while (it.hasNext()) { final ProfilerTask name = it.next(); - String line = "\n " + name + " :"; + String line = "\n " + name + " :"; //$NON-NLS-1$ //$NON-NLS-2$ line += getMissingSpacesForAlignment(line, TimeProfiler.ALIGNMENT_LINE_SIZE); line += times.get(name).toString(); line += getMissingSpacesForAlignment(line, TimeProfiler.ALIGNMENT_LINE_SIZE + 10); - line += " ms"; + line += " ms"; //$NON-NLS-1$ result.append(line); } } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java index 540c04a224..77e2c5832c 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java @@ -99,16 +99,16 @@ public class TimeProfiler2 extends TimeProfiler { final Iterator<Entry<ProfilerTask, Long>> it = timeSet.iterator(); while (it.hasNext()) { final Entry<ProfilerTask, Long> entry = it.next(); - final StringBuffer line = new StringBuffer("\n " + entry.getKey() + " :"); + final StringBuffer line = new StringBuffer("\n " + entry.getKey() + " :"); //$NON-NLS-1$ //$NON-NLS-2$ final CompositeTask compositeTask = getCompositeTask(entry.getKey()); if (compositeTask != null) { line.append(compositeTask.getOccurences()); - line.append(" occurences for "); + line.append(" occurences for "); //$NON-NLS-1$ } line.append(getMissingSpacesForAlignment(line.toString(), TimeProfiler.ALIGNMENT_LINE_SIZE)); line.append(entry.getValue().toString()); line.append(getMissingSpacesForAlignment(line.toString(), TimeProfiler.ALIGNMENT_LINE_SIZE + 10)); - line.append(" ms"); + line.append(" ms"); //$NON-NLS-1$ result.append(line); } } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/FileProvider.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/FileProvider.java index bfa97fa894..f5fe3324e7 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/FileProvider.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/FileProvider.java @@ -110,7 +110,7 @@ public class FileProvider { * @return the file */ public File getFile(final String pluginId, final String fullName, final String extension) { - final IPath fullPath = new Path(fullName.replaceAll("\\.", "/")).addFileExtension(extension); + final IPath fullPath = new Path(fullName.replaceAll("\\.", "/")).addFileExtension(extension); //$NON-NLS-1$ //$NON-NLS-2$ return getFile(pluginId, fullPath); } @@ -188,7 +188,7 @@ public class FileProvider { if (bundle != null) { URL url = bundle.getEntry(relativePath.toString()); - if (url == null && "mt".equals(relativePath.getFileExtension()) && relativePath.segmentCount() > 1) { + if (url == null && "mt".equals(relativePath.getFileExtension()) && relativePath.segmentCount() > 1) { //$NON-NLS-1$ url = bundle.getEntry(relativePath.removeFirstSegments(1).toString()); if (url == null) { url = getRuntimeModeURL(bundle, relativePath); @@ -215,7 +215,7 @@ public class FileProvider { file2plugin.put(file, pluginId); file2path.put(file, relativePath.toString()); // Copy the properties in the bundle area - final Enumeration<?> allProperties = bundle.findEntries(relativePath.removeLastSegments(1).toString(), "*.properties", true); + final Enumeration<?> allProperties = bundle.findEntries(relativePath.removeLastSegments(1).toString(), "*.properties", true); //$NON-NLS-1$ while (allProperties != null && allProperties.hasMoreElements()) { final URL propertyFileURL = (URL) allProperties.nextElement(); if (propertyFileURL != null) { @@ -235,7 +235,7 @@ public class FileProvider { final String requiredBundles = bundle.getHeaders().get(Constants.REQUIRE_BUNDLE); if (requiredBundles != null) { - final StringTokenizer st = new StringTokenizer(requiredBundles, ","); + final StringTokenizer st = new StringTokenizer(requiredBundles, ","); //$NON-NLS-1$ while (st.hasMoreTokens()) { String id = st.nextToken().trim(); final int iDot = id.indexOf(';'); @@ -258,7 +258,7 @@ public class FileProvider { if (mtName2mtURLs == null) { mtName2mtURLs = new HashMap<String, List<URL>>(); bundleName2mtPaths.put(bundle.getSymbolicName(), mtName2mtURLs); - final Enumeration<?> entries = bundle.findEntries("/", "*.mt", true); + final Enumeration<?> entries = bundle.findEntries("/", "*.mt", true); //$NON-NLS-1$ //$NON-NLS-2$ if (entries != null) { while (entries.hasMoreElements()) { final URL entry = (URL) entries.nextElement(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java index ce488c9875..78dfcf6b40 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java @@ -34,9 +34,9 @@ import org.eclipse.sirius.common.tools.DslCommonPlugin; public class ResourceSetFactory { /** The extension point. */ - private static final String FACTORY_EXTENSION_POINT = DslCommonPlugin.PLUGIN_ID + ".resourceSetFactory"; + private static final String FACTORY_EXTENSION_POINT = DslCommonPlugin.PLUGIN_ID + ".resourceSetFactory"; //$NON-NLS-1$ - private static final String CLASS_ATTRIBUTE = "class"; + private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * One should use the static method to instanciate the class. diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetSync.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetSync.java index ed1e85d2b3..5a248561c2 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetSync.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetSync.java @@ -72,7 +72,7 @@ public final class ResourceSetSync extends ResourceSetListenerImpl implements Re * (only use to not consider CDOResources as read-only, see * {@link ResourceSetSync#isReadOnly(Resource)}). */ - public static final String CDO_URI_SCHEME = "cdo"; + public static final String CDO_URI_SCHEME = "cdo"; //$NON-NLS-1$ private static final String FILE_MODIFICATION_VALIDATION_STATUS = "File modification validation status"; //$NON-NLS-1$ @@ -451,7 +451,7 @@ public final class ResourceSetSync extends ResourceSetListenerImpl implements Re final StringBuffer buff = new StringBuffer(); for (final Entry<Resource, ResourceStatus> entry : statuses.entrySet()) { buff.append(entry.getKey().getURI()); - buff.append(":"); + buff.append(":"); //$NON-NLS-1$ buff.append(entry.getValue()); } @@ -536,7 +536,7 @@ public final class ResourceSetSync extends ResourceSetListenerImpl implements Re } if (status.getChildren().length == 0 || !status.isOK()) { - throw new InterruptedException(status.getPlugin() + ":" + status.getMessage()); + throw new InterruptedException(status.getPlugin() + ":" + status.getMessage()); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/CartesianProduct.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/CartesianProduct.java index 838963c7f0..72d93d3b92 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/CartesianProduct.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/CartesianProduct.java @@ -97,7 +97,7 @@ public class CartesianProduct implements Iterable<EObjectCouple>, Iterator<EObje */ @Override public String toString() { - return "ProductIterator"; + return "ProductIterator"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java index b1fd140c31..760ca296c6 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java @@ -56,21 +56,11 @@ public class EObjectCouple { this.int2 = ids.getOrCreateID(obj2); } - /** - * {@inheritDoc} - * - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return int1 + int2; } - /** - * {@inheritDoc} - * - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object obj) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java index a057b7ddb1..55be2aab15 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java @@ -187,7 +187,7 @@ public final class EclipseUtil { if (keyAttributeName != null) { key = element.getAttribute(keyAttributeName); } - key = Objects.firstNonNull(key, ""); + key = Objects.firstNonNull(key, ""); //$NON-NLS-1$ Collection<T> val = contributors.get(key); if (val == null) { val = Lists.newArrayList(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/FileUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/FileUtil.java index 76a0884d70..97919618ed 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/FileUtil.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/FileUtil.java @@ -19,8 +19,8 @@ package org.eclipse.sirius.common.tools.api.util; public final class FileUtil { /** reserved filename and folders on win systems. */ - private static final String[] WINDOWS_RESERVED_FILE_AND_FOLDER_NAME = { "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", - "lpt7", "lpt8", "lpt9", "con", "nul", "prn", }; + private static final String[] WINDOWS_RESERVED_FILE_AND_FOLDER_NAME = { "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ + "lpt7", "lpt8", "lpt9", "con", "nul", "prn", }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ /** max length for file name on windows. */ private static final int WINDOWS_FILENAME_MAX_LENGTH = 255; @@ -111,7 +111,7 @@ public final class FileUtil { String newFilename = removeIllegalCharacters(); while (isAReservedFilename(newFilename)) { - newFilename = newFilename.concat("-"); + newFilename = newFilename.concat("-"); //$NON-NLS-1$ } while (exceedMaxLength(newFilename)) { newFilename = newFilename.substring(0, newFilename.length() - 2); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java index a951492361..5f7d61ded0 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java @@ -27,7 +27,7 @@ import org.eclipse.core.runtime.SubProgressMonitor; */ public final class ResourceUtil { - private static final String FILE_SEPARATOR = "/"; + private static final String FILE_SEPARATOR = "/"; //$NON-NLS-1$ /** * Avoid instantiation. @@ -50,15 +50,15 @@ public final class ResourceUtil { public static IFile createBackupFile(final IFile file, final IProgressMonitor monitor) throws CoreException { monitor.beginTask("Backup and refresh workspace", 2); // computes a timestamp. - final String timestamp = new SimpleDateFormat("yyyyMMdd_HHmm").format(new Date()); + final String timestamp = new SimpleDateFormat("yyyyMMdd_HHmm").format(new Date()); //$NON-NLS-1$ // Computes a candidate name. final int lastDotIndex = file.getName().lastIndexOf('.'); final String name; if (lastDotIndex > 0) { - name = file.getName().substring(0, lastDotIndex) + "-" + timestamp + "." + file.getName().substring(lastDotIndex + ".".length()) + ".old"; + name = file.getName().substring(0, lastDotIndex) + "-" + timestamp + "." + file.getName().substring(lastDotIndex + ".".length()) + ".old"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } else { - name = file.getName() + "-" + timestamp + ".old"; + name = file.getName() + "-" + timestamp + ".old"; //$NON-NLS-1$ //$NON-NLS-2$ } // find the backup file. diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/StringUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/StringUtil.java index 8b03760518..dcf411ab4d 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/StringUtil.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/StringUtil.java @@ -18,10 +18,10 @@ package org.eclipse.sirius.common.tools.api.util; public final class StringUtil { /** "". */ - public static final String EMPTY_STRING = ""; // $NON-NLS$ + public static final String EMPTY_STRING = ""; //$NON-NLS-1$ /** "*". */ - public static final String JOKER_STRING = "*"; // $NON-NLS$ + public static final String JOKER_STRING = "*"; //$NON-NLS-1$ /** * Avoid instantiation. diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/assist/ContentContextHelper.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/assist/ContentContextHelper.java index 98690dc353..87a3fa1b3b 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/assist/ContentContextHelper.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/assist/ContentContextHelper.java @@ -53,7 +53,7 @@ public class ContentContextHelper { * @return the proposal start. */ public String getProposalStart() { - String proposalStart = ""; + String proposalStart = ""; //$NON-NLS-1$ // There are two cases considered here. In the first case there is no // selected interpreter, so the completion is done on interpreters diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java index 67977563ce..3e04ff09fb 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java @@ -61,10 +61,10 @@ public class DynamicEPackageService { if (location != null) { URI locationURI = URI.createURI(location); if (locationURI.isRelative()) { - locationURI = URI.createPlatformPluginURI(element.getDeclaringExtension().getContributor().getName() + "/" + location, true); + locationURI = URI.createPlatformPluginURI(element.getDeclaringExtension().getContributor().getName() + "/" + location, true); //$NON-NLS-1$ } if (!locationURI.hasFragment()) { - locationURI = locationURI.appendFragment("/"); + locationURI = locationURI.appendFragment("/"); //$NON-NLS-1$ } return (EPackage) resourceSet.getEObject(locationURI, true); } else { @@ -85,7 +85,7 @@ public class DynamicEPackageService { // try { Class<?> javaClass = Platform.getBundle(element.getDeclaringExtension().getContributor().getName()).loadClass(element.getAttribute(attributeName)); - Field field = javaClass.getField("eINSTANCE"); + Field field = javaClass.getField("eINSTANCE"); //$NON-NLS-1$ Object result = field.get(null); return (EPackage) result; } catch (ClassNotFoundException e) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java index c95d90ca51..b6d49dfa83 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java @@ -35,13 +35,13 @@ import org.eclipse.sirius.common.tools.internal.ecore.DynamicEPackageService.EPa */ public class DynamicPackageRegistryReader extends RegistryReader { - public static final String DYNAMIC_PACKAGE_PPID = "dynamic_package"; + public static final String DYNAMIC_PACKAGE_PPID = "dynamic_package"; //$NON-NLS-1$ - static final String TAG_RESOURCE = "resource"; + static final String TAG_RESOURCE = "resource"; //$NON-NLS-1$ - static final String ATT_URI = "uri"; + static final String ATT_URI = "uri"; //$NON-NLS-1$ - static final String ATT_LOCATION = "location"; + static final String ATT_LOCATION = "location"; //$NON-NLS-1$ public static class PluginClassDescriptor { protected IConfigurationElement element; diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java index bdfac5ede9..9fc82c79ef 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java @@ -69,23 +69,17 @@ public class EclipseEditingDomainFactoryDescriptor implements EditingDomainFacto this.element = configuration; } - /** - * {@inheritDoc} - */ + @Override public String getId() { return id; } - /** - * {@inheritDoc} - */ + @Override public String getOverrideValue() { return overrideValue; } - /** - * {@inheritDoc} - */ + @Override public IEditingDomainFactory getEditingDomainFactory() { if (extension == null) { if (Platform.isRunning()) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/AbstractInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/AbstractInterpreter.java index bfd78e1f77..e42012a9c4 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/AbstractInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/AbstractInterpreter.java @@ -36,7 +36,7 @@ import com.google.common.collect.Lists; public abstract class AbstractInterpreter implements IInterpreter, TypedValidation { /** The separator between EPackage name and EClass name for domain class. */ - protected static final String SEPARATOR = "."; + protected static final String SEPARATOR = "."; //$NON-NLS-1$ /** * {@inheritDoc} @@ -75,9 +75,9 @@ public abstract class AbstractInterpreter implements IInterpreter, TypedValidati result = ((Boolean) raw).booleanValue(); } else { String toString = raw.toString(); - if ("true".equalsIgnoreCase(toString)) { + if ("true".equalsIgnoreCase(toString)) { //$NON-NLS-1$ result = true; - } else if ("false".equalsIgnoreCase(toString)) { + } else if ("false".equalsIgnoreCase(toString)) { //$NON-NLS-1$ result = false; } else { /* @@ -112,7 +112,7 @@ public abstract class AbstractInterpreter implements IInterpreter, TypedValidati if (raw != null) { return String.valueOf(raw); } else { - return ""; + return ""; //$NON-NLS-1$ } } @@ -216,7 +216,7 @@ public abstract class AbstractInterpreter implements IInterpreter, TypedValidati * {@inheritDoc} */ public String getVariablePrefix() { - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java index c589be6a6b..66d764d583 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java @@ -48,7 +48,7 @@ public class BundleClassLoading implements ClassLoading { * The extension point id used to contribute generated EPackages to the EMF * runtime. */ - protected static final String EMF_GENERATED_PACKAGE_EXTENSIONPOINT = "org.eclipse.emf.ecore.generated_package"; + protected static final String EMF_GENERATED_PACKAGE_EXTENSIONPOINT = "org.eclipse.emf.ecore.generated_package"; //$NON-NLS-1$ @Override public void setClasspathChangeCallback(ClasspathChangeCallback listener) { @@ -137,9 +137,9 @@ public class BundleClassLoading implements ClassLoading { if (bundles.contains(contributorName)) { for (IConfigurationElement element : ce) { - String nsURI = element.getAttribute("uri"); - String className = element.getAttribute("class"); - String genModel = element.getAttribute("genModel"); + String nsURI = element.getAttribute("uri"); //$NON-NLS-1$ + String className = element.getAttribute("class"); //$NON-NLS-1$ + String genModel = element.getAttribute("genModel"); //$NON-NLS-1$ if (nsURI != null && className != null) { contributions.put(contributorName, new EPackageDeclaration(nsURI, className, genModel)); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java index 707c469482..d1bb75c3a9 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java @@ -36,12 +36,12 @@ public final class ClassLoadingService { /** * ClassLoading service extension point ID. */ - private static final String ID = "org.eclipse.sirius.common.classloading_override"; + private static final String ID = "org.eclipse.sirius.common.classloading_override"; //$NON-NLS-1$ /** * Extension point attribute to get the {@link ClassLoading} class. */ - private static final String CLASS_ATTRIBUTE = "class"; + private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ private ClassLoadingService() { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java index ac42a702a1..cfdd1dbc84 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java @@ -41,43 +41,37 @@ import com.google.common.collect.Sets; public class FeatureInterpreter extends AbstractInterpreter implements org.eclipse.sirius.common.tools.api.interpreter.IInterpreter, IInterpreterProvider { /** The Feature interpreter prefix. */ - public static final String PREFIX = "feature:"; + public static final String PREFIX = "feature:"; //$NON-NLS-1$ /** The eContainer feature name. */ - public static final String E_CONTAINER_FEATURE_NAME = "eContainer"; + public static final String E_CONTAINER_FEATURE_NAME = "eContainer"; //$NON-NLS-1$ /** The eContents feature name. */ - public static final String E_CONTENTS_FEATURE_NAME = "eContents"; + public static final String E_CONTENTS_FEATURE_NAME = "eContents"; //$NON-NLS-1$ /** The eAllContents feature name. */ - public static final String E_ALL_CONTENTS_FEATURE_NAME = "eAllContents"; + public static final String E_ALL_CONTENTS_FEATURE_NAME = "eAllContents"; //$NON-NLS-1$ /** The eClass feature name. */ - public static final String E_CLASS_FEATURE_NAME = "eClass"; + public static final String E_CLASS_FEATURE_NAME = "eClass"; //$NON-NLS-1$ /** The eCrossReferences pseudo-feature name. */ - public static final String E_CROSS_REFERENCES_FEATURE_NAME = "eCrossReferences"; + public static final String E_CROSS_REFERENCES_FEATURE_NAME = "eCrossReferences"; //$NON-NLS-1$ /** The default feature names. */ public static final String[] DEFAULT_FEATURE_NAMES = { E_CONTAINER_FEATURE_NAME, E_CONTENTS_FEATURE_NAME, E_ALL_CONTENTS_FEATURE_NAME, E_CLASS_FEATURE_NAME, E_CROSS_REFERENCES_FEATURE_NAME }; - /** - * {@inheritDoc} - */ + @Override public IInterpreter createInterpreter() { return new FeatureInterpreter(); } - /** - * {@inheritDoc} - */ + @Override public String getPrefix() { return PREFIX; } - /** - * {@inheritDoc} - */ + @Override public Object evaluate(EObject target, String expression) throws EvaluationException { Object result = null; if (target != null && expression != null && expression.startsWith(PREFIX)) { @@ -102,17 +96,11 @@ public class FeatureInterpreter extends AbstractInterpreter implements org.eclip return result; } - /** - * {@inheritDoc} - */ @Override public boolean supportsValidation() { return true; } - /** - * {@inheritDoc} - */ @Override public ValidationResult analyzeExpression(IInterpreterContext context, String expression) { ValidationResult interpreterStatus = new ValidationResult(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java index 3709c51301..f005d6f686 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java @@ -46,9 +46,7 @@ class MonomorphicService implements IMonomorphicService { return serviceMethod.getName(); } - /** - * {@inheritDoc} - */ + @Override public boolean appliesTo(Object[] target) { boolean apply = true; Class<?>[] parameters = serviceMethod.getParameterTypes(); @@ -85,12 +83,10 @@ class MonomorphicService implements IMonomorphicService { @Override public String toString() { - return serviceInstance.getClass().getCanonicalName() + "." + serviceMethod.getName() + "(" + serviceMethod.getParameterTypes()[0].getCanonicalName() + ")"; + return serviceInstance.getClass().getCanonicalName() + "." + serviceMethod.getName() + "(" + serviceMethod.getParameterTypes()[0].getCanonicalName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - /** - * {@inheritDoc} - */ + @Override public List<String> getParametersTypes() { List<String> parametersTypes = new ArrayList<String>(); for (Class<?> type : serviceMethod.getParameterTypes()) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java index 9a5fa23f7d..a43ee9a68e 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java @@ -42,16 +42,16 @@ import com.google.common.collect.Multimap; public class ServiceInterpreter extends VariableInterpreter implements org.eclipse.sirius.common.tools.api.interpreter.IInterpreter, IInterpreterProvider { /** The Service interpreter prefix. */ - public static final String PREFIX = "service:"; + public static final String PREFIX = "service:"; //$NON-NLS-1$ /** * The character used to separate receiver and service. */ - public static final String RECEIVER_SEPARATOR = "."; + public static final String RECEIVER_SEPARATOR = "."; //$NON-NLS-1$ private static final String EOBJECT_CLASS_NAME = EObject.class.getCanonicalName(); - private static final Pattern SPLIT_PATTERN = Pattern.compile("[(,)]"); + private static final Pattern SPLIT_PATTERN = Pattern.compile("[(,)]"); //$NON-NLS-1$ private final Map<Object, Object> properties = Maps.newHashMap(); @@ -137,7 +137,7 @@ public class ServiceInterpreter extends VariableInterpreter implements org.eclip throw new EvaluationException("The receiver of the service call " + serviceCall + " is not an EObject."); } } - int indexOfParenthesis = serviceCall.indexOf("("); + int indexOfParenthesis = serviceCall.indexOf("("); //$NON-NLS-1$ serviceName = serviceCall.substring(0, indexOfParenthesis == -1 ? serviceCall.length() : indexOfParenthesis); Object[] parameters = new Object[] { receiver }; diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java index c98bc37a5e..f84bb28310 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java @@ -32,10 +32,10 @@ import org.eclipse.sirius.common.tools.api.interpreter.VariableType; public class VariableInterpreter extends AbstractInterpreter implements org.eclipse.sirius.common.tools.api.interpreter.IInterpreter, IInterpreterProvider { /** The Variable interpreter prefix. */ - public static final String PREFIX = "var:"; + public static final String PREFIX = "var:"; //$NON-NLS-1$ /** The self variable name. */ - public static final String SELF_VARIABLE_NAME = "self"; + public static final String SELF_VARIABLE_NAME = "self"; //$NON-NLS-1$ /** The variables manager. */ private final VariableManager variablesManager; @@ -75,9 +75,7 @@ public class VariableInterpreter extends AbstractInterpreter implements org.ecli return variablesManager.getVariables(); } - /** - * {@inheritDoc} - */ + @Override public Object evaluate(EObject target, String expression) throws EvaluationException { Object result = null; if (target != null && expression != null && expression.startsWith(PREFIX)) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java index 15f9e4dcc9..fb0673c9fd 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java @@ -44,9 +44,7 @@ public class EditingSessionWorkspaceListener implements IResourceChangeListener this.workspaceBackend = workspaceBackend; } - /** - * {@inheritDoc} - */ + @Override public void resourceChanged(final IResourceChangeEvent event) { final IResourceDelta delta = event.getDelta(); try { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorProviderImpl.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorProviderImpl.java index 0636f8f4b6..4878b85feb 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorProviderImpl.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorProviderImpl.java @@ -30,7 +30,7 @@ import org.eclipse.sirius.common.tools.api.resource.IFileModificationValidator; public final class FileModificationValidatorProviderImpl implements FileModificationValidatorProvider { /** The extension point. */ - private static final String VALIDATION_EXTENSION_POINT = DslCommonPlugin.PLUGIN_ID + ".fileModificationValidator"; + private static final String VALIDATION_EXTENSION_POINT = DslCommonPlugin.PLUGIN_ID + ".fileModificationValidator"; //$NON-NLS-1$ private Collection<FileModificationValidatorDescriptor> validationEditDescriptors = new HashSet<FileModificationValidatorDescriptor>(); diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceDeltaVisitor.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceDeltaVisitor.java index 1695a5db68..04ef78b9eb 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceDeltaVisitor.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceDeltaVisitor.java @@ -113,7 +113,7 @@ public class ResourceDeltaVisitor implements IResourceDeltaVisitor { URIConverter theURIConverter = workspaceBackend.getObservedSet().getURIConverter(); URI normalizedURI = theURIConverter.normalize(uri); for (Resource resource : initialresources) { - URI resourceNormalizedURI = URI.createURI(""); + URI resourceNormalizedURI = URI.createURI(""); //$NON-NLS-1$ try { resourceNormalizedURI = workspaceBackend.getObservedSet().getURIConverter().normalize(resource.getURI()); } catch (IllegalStateException e) { diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java index 52e086acc0..86444d3522 100644 --- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java +++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java @@ -28,7 +28,7 @@ import org.eclipse.sirius.common.tools.api.resource.ResourceSyncClient; public class ResourceSyncClientNotifier extends Job { /** The family id for this kind of job. */ - public static final String FAMILY = DslCommonPlugin.PLUGIN_ID + ".ResourceSyncClientNotification"; + public static final String FAMILY = DslCommonPlugin.PLUGIN_ID + ".ResourceSyncClientNotification"; //$NON-NLS-1$ private static final String ACTION_NAME = "ResourceSyncClient notification"; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/SequenceDiagramUIPlugin.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/SequenceDiagramUIPlugin.java index f0fb14a6f1..6b0e0aea15 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/SequenceDiagramUIPlugin.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/SequenceDiagramUIPlugin.java @@ -26,7 +26,7 @@ public class SequenceDiagramUIPlugin extends EMFPlugin { /** * The plug-in ID. */ - public static final String PLUGIN_ID = "org.eclipse.sirius.diagram.sequence.ui"; + public static final String PLUGIN_ID = "org.eclipse.sirius.diagram.sequence.ui"; //$NON-NLS-1$ /** * Keep track of the singleton. diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java index bde7eae465..161b7e4a51 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java @@ -284,9 +284,9 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider EClass variable = org.eclipse.sirius.viewpoint.description.tool.ToolPackage.eINSTANCE.getAbstractVariable(); if (variable.isSuperTypeOf(k)) { AbstractVariable var = (AbstractVariable) k.getEPackage().getEFactoryInstance().create(k); - EAnnotation annotation = ref.getEAnnotation("toolVariable"); + EAnnotation annotation = ref.getEAnnotation("toolVariable"); //$NON-NLS-1$ if (annotation != null) { - var.setName(annotation.getDetails().get("name")); + var.setName(annotation.getDetails().get("name")); //$NON-NLS-1$ } else { var.setName(ref.getName()); } @@ -436,14 +436,14 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider public String completeToolTipText(String toolTipText, EObject eObject, EStructuralFeature feature) { StringBuilder sb = new StringBuilder(); if (!StringUtil.isEmpty(toolTipText)) { - sb.append(toolTipText + "\n"); - sb.append("\n"); + sb.append(toolTipText + "\n"); //$NON-NLS-1$ + sb.append("\n"); //$NON-NLS-1$ } sb.append("Additional available variable for Sequence Diagram:"); sb.append("\n . "); - sb.append("endBefore"); - sb.append(": "); + sb.append("endBefore"); //$NON-NLS-1$ + sb.append(": "); //$NON-NLS-1$ sb.append("an EventEnd referencing the semantic event end "); return sb.toString(); diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/migration/SequenceDiagramRepresentationsFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/migration/SequenceDiagramRepresentationsFileMigrationParticipant.java index 2ec8322be5..1b95503322 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/migration/SequenceDiagramRepresentationsFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/migration/SequenceDiagramRepresentationsFileMigrationParticipant.java @@ -65,16 +65,16 @@ public class SequenceDiagramRepresentationsFileMigrationParticipant extends Abst /** * Sequence Message flag reset migration version. */ - public static final Version MESSAGE_FLAG_MIGRATION_VERSION = new Version("8.1.1"); + public static final Version MESSAGE_FLAG_MIGRATION_VERSION = new Version("8.1.1"); //$NON-NLS-1$ /** * Sequence GMF bounds migration version. */ - public static final Version GMF_BOUNDS_MIGRATION_VERSION = new Version("6.7.0.201302181200"); + public static final Version GMF_BOUNDS_MIGRATION_VERSION = new Version("6.7.0.201302181200"); //$NON-NLS-1$ - private static final Version GMF_BOUNDS_ALREADY_MIGRATED_VERSION = new Version("6.5.3"); + private static final Version GMF_BOUNDS_ALREADY_MIGRATED_VERSION = new Version("6.5.3"); //$NON-NLS-1$ - private static final Version GMF_BOUNDS_NOT_MIGRATED_VERSION = new Version("6.6.0"); + private static final Version GMF_BOUNDS_NOT_MIGRATED_VERSION = new Version("6.6.0"); //$NON-NLS-1$ /** * The latest VP version for this participant. diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ConnectionAnchorOperation.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ConnectionAnchorOperation.java index 23c4c32ca9..57c9e0534b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ConnectionAnchorOperation.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ConnectionAnchorOperation.java @@ -65,7 +65,7 @@ public final class ConnectionAnchorOperation { * face. */ public static ConnectionAnchor getHorizontallyCenteredAndTopAnchor(ConnectionAnchor anchor) { - return getCorrectedAnchor(anchor, "(0.5,0)", 0.5); + return getCorrectedAnchor(anchor, "(0.5,0)", 0.5); //$NON-NLS-1$ } /** @@ -78,7 +78,7 @@ public final class ConnectionAnchorOperation { * face. */ public static ConnectionAnchor getHorizontallyCenteredAndBottomAnchor(ConnectionAnchor anchor) { - return getCorrectedAnchor(anchor, "(0.5,1)", 0.5); + return getCorrectedAnchor(anchor, "(0.5,1)", 0.5); //$NON-NLS-1$ } private static ConnectionAnchor getCorrectedAnchor(ConnectionAnchor anchor, String defaultId, double preciseX) { diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java index 32629330c3..c0201f5733 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java @@ -126,7 +126,7 @@ public class InteractionUseEditPart extends DNodeContainerEditPart implements IS * @return the center label expression */ protected String computeCenterLabelExpression() { - String centeredLabelText = ""; + String centeredLabelText = ""; //$NON-NLS-1$ if (resolveSemanticElement() instanceof DNodeContainer) { DNodeContainer dNodeContainer = (DNodeContainer) resolveSemanticElement(); if (dNodeContainer.eContainer() != null) { @@ -154,7 +154,7 @@ public class InteractionUseEditPart extends DNodeContainerEditPart implements IS return interpreter.evaluateString(self, expression); } } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/SequenceMessageEditPart.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/SequenceMessageEditPart.java index d6d24dc153..ddbc3303fc 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/SequenceMessageEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/SequenceMessageEditPart.java @@ -47,7 +47,7 @@ public class SequenceMessageEditPart extends DEdgeEditPart implements ISequenceE /** * id for extended meta data. */ - public static final String MSG_TO_SELF_TOP_MOVE = "messageToSelfTopMove"; + public static final String MSG_TO_SELF_TOP_MOVE = "messageToSelfTopMove"; //$NON-NLS-1$ /** * The global router for all the messages. diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSemanticEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSemanticEditPolicy.java index 294c159e3a..6a67fc2a9e 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSemanticEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSemanticEditPolicy.java @@ -105,7 +105,7 @@ public class ExecutionSemanticEditPolicy extends DNode2ItemSemanticEditPolicy { // adding an EndOfLifeEditPart will resize the RootExecution // to // keep the same global size on the lifeline - String label = superCommand != null ? superCommand.getLabel() : ""; + String label = superCommand != null ? superCommand.getLabel() : ""; //$NON-NLS-1$ CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(getEditingDomain(), label); if (superCommand != null) { diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java index 07e8fb6988..2d042c27eb 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java @@ -193,7 +193,7 @@ public class InstanceRoleResizableEditPolicy extends AirResizableEditPolicy { * is not needed */ private ICommand getMoveViewCommands(TransactionalEditingDomain transactionalEditingDomain, Map<InstanceRole, Point> moveDeltas) { - CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, ""); + CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, ""); //$NON-NLS-1$ // handle move lost nodes Multimap<InstanceRole, LostMessageEnd> lostNodes = HashMultimap.create(); @@ -246,7 +246,7 @@ public class InstanceRoleResizableEditPolicy extends AirResizableEditPolicy { * @return composition of {@link ResizeViewOperation} */ private ICommand getResizeViewCommands(TransactionalEditingDomain transactionalEditingDomain, Map<InstanceRole, Dimension> sizeDeltas) { - CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, ""); + CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, ""); //$NON-NLS-1$ // Resize Commands for (Entry<InstanceRole, Dimension> entry : sizeDeltas.entrySet()) { Dimension sizeDelta = entry.getValue(); diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java index e100b22991..04b6b74fe9 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java @@ -398,7 +398,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy { result = UnexecutableCommand.INSTANCE; } else { String label = baseCommand.getLabel(); - CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(thisEvent.getEditingDomain(), (label != null ? label : "<null>") + " and synchronize ordering"); + CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(thisEvent.getEditingDomain(), (label != null ? label : "<null>") + " and synchronize ordering"); //$NON-NLS-1$ SequenceEditPartsOperations.appendFullRefresh(thisEvent, ctc); MoveType move = getMoveType(thisEvent, request, ends); @@ -841,7 +841,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy { @Override public String toString() { - return "[fromTop:" + fromTop + ", compound:" + needsCompoundMove + "]"; + return "[fromTop:" + fromTop + ", compound:" + needsCompoundMove + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceSiriusGraphicalNodeEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceSiriusGraphicalNodeEditPolicy.java index bcd6297856..cfdf589c64 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceSiriusGraphicalNodeEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceSiriusGraphicalNodeEditPolicy.java @@ -69,7 +69,7 @@ public class SequenceSiriusGraphicalNodeEditPolicy extends SiriusGraphicalNodeEd * Constant used to store the location in draw2d absolute coordinates of the * click on the {@link EdgeTarget} source. */ - protected static final String DRAW2D_EDGE_LOCATION_SOURCE = "edge.absolute.location.source"; + protected static final String DRAW2D_EDGE_LOCATION_SOURCE = "edge.absolute.location.source"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInteractionFrameValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInteractionFrameValidator.java index dec059cf65..dc5adf5a59 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInteractionFrameValidator.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInteractionFrameValidator.java @@ -45,7 +45,7 @@ import com.google.common.collect.Sets; * @author mporhel */ public abstract class AbstractInteractionFrameValidator { - private static final String FRAME_RESIZE_VALIDATOR = "org.eclipse.sirius.sequence.resize.frame.validator"; + private static final String FRAME_RESIZE_VALIDATOR = "org.eclipse.sirius.sequence.resize.frame.validator"; //$NON-NLS-1$ /** * Expansion zone. diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java index 6b9d8d0f1e..adb50799eb 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java @@ -59,7 +59,7 @@ public class AbstractNodeEventResizeSelectionValidator { */ public static final String GROUP_REQUEST_ALREADY_ANSWERED = "Already answered"; - private static final String EXECUTION_RESIZE_VALIDATOR = "org.eclipse.sirius.sequence.resize.execution.validator"; + private static final String EXECUTION_RESIZE_VALIDATOR = "org.eclipse.sirius.sequence.resize.execution.validator"; //$NON-NLS-1$ /** * The expansionZine. diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/FrameCreationValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/FrameCreationValidator.java index bdb01ec027..fc1f84077b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/FrameCreationValidator.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/FrameCreationValidator.java @@ -62,9 +62,9 @@ public class FrameCreationValidator extends AbstractSequenceInteractionValidator * The key used in request's extended data map to identify the original * target edit part of a request which was redirected to us. */ - public static final String ORIGINAL_TARGET = "original.target"; + public static final String ORIGINAL_TARGET = "original.target"; //$NON-NLS-1$ - private static final String VALIDATOR = "org.eclipse.sirius.sequence.frame.creation.validator"; + private static final String VALIDATOR = "org.eclipse.sirius.sequence.frame.creation.validator"; //$NON-NLS-1$ private SequenceDiagram sequenceDiagram; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/ISEComplexMoveValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/ISEComplexMoveValidator.java index a4434ebdc2..91111e5528 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/ISEComplexMoveValidator.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/ISEComplexMoveValidator.java @@ -57,7 +57,7 @@ import com.google.common.collect.Sets; */ public class ISEComplexMoveValidator extends AbstractSequenceInteractionValidator { - private static final String VALIDATOR = "org.eclipse.sirius.sequence.move.validator"; + private static final String VALIDATOR = "org.eclipse.sirius.sequence.move.validator"; //$NON-NLS-1$ /** List of top levels events of the current move. */ protected final Set<ISequenceEvent> topLevelElements = new HashSet<ISequenceEvent>(); diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/figure/SequenceSlidableAnchor.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/figure/SequenceSlidableAnchor.java index 86a8805086..43d6646e8a 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/figure/SequenceSlidableAnchor.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/figure/SequenceSlidableAnchor.java @@ -81,7 +81,7 @@ public class SequenceSlidableAnchor extends SlidableAnchor { public String getTerminal() { String terminal = super.getTerminal(); if (custom) { - terminal = terminal + " custom"; + terminal = terminal + " custom"; //$NON-NLS-1$ } return terminal; } @@ -93,7 +93,7 @@ public class SequenceSlidableAnchor extends SlidableAnchor { * an anchor terminal id. */ public void updateCustomStatus(String terminal) { - if (terminal.contains("custom")) { + if (terminal.contains("custom")) { //$NON-NLS-1$ custom = true; } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/RequestQuery.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/RequestQuery.java index 8285f11213..e46abcfac1 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/RequestQuery.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/util/RequestQuery.java @@ -50,7 +50,7 @@ public class RequestQuery extends org.eclipse.sirius.diagram.ui.business.interna /** * Constaint to check if request if from another indirect request. */ - public static final String IS_MOVED_BY_PARENT_EXECUTION = "isMovedByParentExecution"; + public static final String IS_MOVED_BY_PARENT_EXECUTION = "isMovedByParentExecution"; //$NON-NLS-1$ /** * Constructor. diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/RangeHelper.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/RangeHelper.java index d2f08044e3..974c2507f2 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/RangeHelper.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/RangeHelper.java @@ -105,7 +105,7 @@ public final class RangeHelper { @Override public String toString() { - return "lowerBound"; + return "lowerBound"; //$NON-NLS-1$ } } @@ -121,7 +121,7 @@ public final class RangeHelper { @Override public String toString() { - return "upperBound"; + return "upperBound"; //$NON-NLS-1$ } } @@ -137,7 +137,7 @@ public final class RangeHelper { @Override public String toString() { - return "width"; + return "width"; //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/color/DefaultColorStyleDescription.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/color/DefaultColorStyleDescription.java index db05195110..a7458aa511 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/color/DefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/color/DefaultColorStyleDescription.java @@ -25,9 +25,9 @@ import org.eclipse.sirius.tools.api.ui.color.EnvironmentSystemColorFactory; */ public class DefaultColorStyleDescription extends TemplateSwitch<EObject> { - private static final String BLACK = "black"; + private static final String BLACK = "black"; //$NON-NLS-1$ - private static final String GRAY = "gray"; + private static final String GRAY = "gray"; //$NON-NLS-1$ /** * Set the default color descriptions on the given EObject. diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractSequenceElement.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractSequenceElement.java index e48eeac2be..614dc4a4b1 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractSequenceElement.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/AbstractSequenceElement.java @@ -149,6 +149,6 @@ public abstract class AbstractSequenceElement extends AdapterImpl implements ISe */ @Override public String toString() { - return "#<" + getClass().getSimpleName() + ": " + view.getElement() + ">"; + return "#<" + getClass().getSimpleName() + ": " + view.getElement() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/InstanceRole.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/InstanceRole.java index 39995460f6..75c3c06fa2 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/InstanceRole.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/elements/InstanceRole.java @@ -152,7 +152,7 @@ public class InstanceRole extends AbstractSequenceNode { if (targetElement instanceof DRepresentationElement) { return ((DRepresentationElement) targetElement).getName(); } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/BasicMessageMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/BasicMessageMappingSpec.java index cc2b5d02cc..5b19e6d5b8 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/BasicMessageMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/BasicMessageMappingSpec.java @@ -148,6 +148,6 @@ public class BasicMessageMappingSpec extends BasicMessageMappingImpl { */ @Override public String toString() { - return getClass().getName() + " " + getName(); + return getClass().getName() + " " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CombinedFragmentMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CombinedFragmentMappingSpec.java index 4dc23820b4..7a60fa17da 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CombinedFragmentMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CombinedFragmentMappingSpec.java @@ -159,7 +159,7 @@ public class CombinedFragmentMappingSpec extends CombinedFragmentMappingImpl imp */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CreationMessageMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CreationMessageMappingSpec.java index 60daf96030..b30c2a4996 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CreationMessageMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/CreationMessageMappingSpec.java @@ -148,7 +148,7 @@ public class CreationMessageMappingSpec extends CreationMessageMappingImpl { */ @Override public String toString() { - return getClass().getName() + " " + getName(); + return getClass().getName() + " " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/DestructionMessageMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/DestructionMessageMappingSpec.java index 8ea68e91b5..16528d6b0d 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/DestructionMessageMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/DestructionMessageMappingSpec.java @@ -148,7 +148,7 @@ public class DestructionMessageMappingSpec extends DestructionMessageMappingImpl */ @Override public String toString() { - return getClass().getName() + " " + getName(); + return getClass().getName() + " " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/EndOfLifeMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/EndOfLifeMappingSpec.java index daed4ca3c6..2c656edc13 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/EndOfLifeMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/EndOfLifeMappingSpec.java @@ -175,7 +175,7 @@ public class EndOfLifeMappingSpec extends EndOfLifeMappingImpl implements INodeM */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ExecutionMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ExecutionMappingSpec.java index 1b2432cf64..0b1989122a 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ExecutionMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ExecutionMappingSpec.java @@ -175,7 +175,7 @@ public class ExecutionMappingSpec extends ExecutionMappingImpl implements INodeM */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InstanceRoleMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InstanceRoleMappingSpec.java index f3e4c3be91..0b6b4f334b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InstanceRoleMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InstanceRoleMappingSpec.java @@ -175,7 +175,7 @@ public class InstanceRoleMappingSpec extends InstanceRoleMappingImpl implements */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InteractionUseMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InteractionUseMappingSpec.java index a8b15995c9..bf0baf3ffe 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InteractionUseMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/InteractionUseMappingSpec.java @@ -159,7 +159,7 @@ public class InteractionUseMappingSpec extends InteractionUseMappingImpl impleme */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ObservationPointMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ObservationPointMappingSpec.java index be65d6811a..c1df4968db 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ObservationPointMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ObservationPointMappingSpec.java @@ -175,7 +175,7 @@ public class ObservationPointMappingSpec extends ObservationPointMappingImpl imp */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/OperandMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/OperandMappingSpec.java index d7280964cb..93f2c0039b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/OperandMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/OperandMappingSpec.java @@ -159,7 +159,7 @@ public class OperandMappingSpec extends OperandMappingImpl implements IContainer */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ReturnMessageMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ReturnMessageMappingSpec.java index e1c0e5c77d..9c3d81ecbd 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ReturnMessageMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/ReturnMessageMappingSpec.java @@ -148,7 +148,7 @@ public class ReturnMessageMappingSpec extends ReturnMessageMappingImpl { */ @Override public String toString() { - return getClass().getName() + " " + getName(); + return getClass().getName() + " " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/StateMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/StateMappingSpec.java index 22a3ed3492..448f107408 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/StateMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/StateMappingSpec.java @@ -175,7 +175,7 @@ public class StateMappingSpec extends StateMappingImpl implements INodeMappingEx */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/RefreshSemanticOrderingsOperation.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/RefreshSemanticOrderingsOperation.java index 4e521798bb..1a48ea9e1e 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/RefreshSemanticOrderingsOperation.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/RefreshSemanticOrderingsOperation.java @@ -56,7 +56,7 @@ public class RefreshSemanticOrderingsOperation extends AbstractModelChangeOperat * The name of the variable used to pass event ends to sort to * user-specified expressions. */ - private static final String EVENT_ENDS_TO_SORT_VARIABLE = "eventEnds"; + private static final String EVENT_ENDS_TO_SORT_VARIABLE = "eventEnds"; //$NON-NLS-1$ private final SequenceDDiagram sequenceDDiagram; diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SequenceMessageRangeHelper.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SequenceMessageRangeHelper.java index c38aeda55a..2c0f1d9b98 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SequenceMessageRangeHelper.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/operation/SequenceMessageRangeHelper.java @@ -32,7 +32,7 @@ import com.google.common.collect.Iterables; * @author pcdavid */ public class SequenceMessageRangeHelper { - private static final String TOP_CENTER_TERMINAL = "(0.5, 0.0)"; + private static final String TOP_CENTER_TERMINAL = "(0.5, 0.0)"; //$NON-NLS-1$ /** * Sets the range for a normal (non-reflective), horizontal message. diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/FixBendpointsOnCreationCommand.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/FixBendpointsOnCreationCommand.java index b1e4224210..9d5e93ff9e 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/FixBendpointsOnCreationCommand.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/refresh/FixBendpointsOnCreationCommand.java @@ -176,7 +176,7 @@ public class FixBendpointsOnCreationCommand extends RecordingCommand { } PrecisionPoint sourceRelativeLocation = getAnchorRelativeLocation(firstClick, sourceBounds); - sourceTerminal = "(" + sourceRelativeLocation.preciseX() + "," + sourceRelativeLocation.preciseY() + ")"; + sourceTerminal = "(" + sourceRelativeLocation.preciseX() + "," + sourceRelativeLocation.preciseY() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ Point secondClick = new Point(0, 0); Rectangle targetBounds = GMFHelper.getAbsoluteBounds((Node) target); @@ -207,7 +207,7 @@ public class FixBendpointsOnCreationCommand extends RecordingCommand { } PrecisionPoint targetRelativeLocation = getAnchorRelativeLocation(secondClick, targetBounds); - targetTerminal = "(" + targetRelativeLocation.preciseX() + "," + targetRelativeLocation.preciseY() + ")"; + targetTerminal = "(" + targetRelativeLocation.preciseX() + "," + targetRelativeLocation.preciseY() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Computes pointList PrecisionPoint sourceRelativeReference = SequenceSlidableAnchor.parseTerminalString(sourceTerminal); diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceToolCommandBuilder.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceToolCommandBuilder.java index 962b071660..1de721af49 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceToolCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/internal/tool/command/builders/SequenceToolCommandBuilder.java @@ -15,5 +15,5 @@ public interface SequenceToolCommandBuilder { /** * End before variable for single click tools. */ - String END_BEFORE_VARIABLE = "endBefore"; + String END_BEFORE_VARIABLE = "endBefore"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/ModelGeneratedMaker.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/ModelGeneratedMaker.java index 77b295149c..49b1898baf 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/ModelGeneratedMaker.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/ModelGeneratedMaker.java @@ -25,7 +25,7 @@ import org.eclipse.sirius.viewpoint.description.DocumentedElement; */ public class ModelGeneratedMaker { - private static final String GENERATED = "@generated"; + private static final String GENERATED = "@generated"; //$NON-NLS-1$ private boolean isGenerated(EObject eObj) { // FIXME : change to real check once the mared elements are handled. diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/TemplateToDiagramDescriptionTransformer.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/TemplateToDiagramDescriptionTransformer.java index f89d658d14..eec0a98b83 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/TemplateToDiagramDescriptionTransformer.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/template/TemplateToDiagramDescriptionTransformer.java @@ -120,7 +120,7 @@ public class TemplateToDiagramDescriptionTransformer { private class Lifeline2ExecutionMapping extends AbstractRule<TLifelineMapping, ExecutionMapping> { - private static final String SELF = "var:self"; + private static final String SELF = "var:self"; //$NON-NLS-1$ public Lifeline2ExecutionMapping(ModelGeneratedMaker marker) { super(marker); @@ -152,7 +152,7 @@ public class TemplateToDiagramDescriptionTransformer { private class Lifeline2EndOfLifeMapping extends AbstractRule<TLifelineMapping, EndOfLifeMapping> { - private static final String SELF = "var:self"; + private static final String SELF = "var:self"; //$NON-NLS-1$ public Lifeline2EndOfLifeMapping(ModelGeneratedMaker marker) { super(marker); @@ -160,7 +160,7 @@ public class TemplateToDiagramDescriptionTransformer { public EndOfLifeMapping apply(TLifelineMapping from) { EndOfLifeMapping to = getOrCreate(from, DescriptionPackage.eINSTANCE.getEndOfLifeMapping()); - to.setName(from.getName() + " EOL"); + to.setName(from.getName() + " EOL"); //$NON-NLS-1$ to.setSemanticCandidatesExpression(SELF); to.setSemanticElements(SELF); to.setDomainClass(from.getDomainClass()); @@ -343,7 +343,7 @@ public class TemplateToDiagramDescriptionTransformer { to.setLineStyle(from.getLineStyle()); to.setSourceArrow(from.getSourceArrow()); to.setStrokeColor(from.getStrokeColor()); - to.setSizeComputationExpression("2"); + to.setSizeComputationExpression("2"); //$NON-NLS-1$ to.setTargetArrow(from.getTargetArrow()); return to; } @@ -428,7 +428,7 @@ public class TemplateToDiagramDescriptionTransformer { to.setBorderSizeComputationExpression(from.getBorderSizeComputationExpression()); to.setResizeKind(ResizeKind.NORTH_SOUTH_LITERAL); to.setShowIcon(false); - to.setLabelExpression("[''/]"); + to.setLabelExpression("[''/]"); //$NON-NLS-1$ to.setWidth(2); to.setHeight(3); return to; diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Pair.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Pair.java index b66886a19f..911cf5b5ea 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Pair.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Pair.java @@ -88,7 +88,7 @@ public class Pair<T> { */ @Override public String toString() { - return "<" + String.valueOf(first) + ", " + String.valueOf(second) + ">"; + return "<" + String.valueOf(first) + ", " + String.valueOf(second) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Range.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Range.java index 7caf5be705..a488d05d9f 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Range.java +++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/util/Range.java @@ -387,7 +387,7 @@ public class Range { @Override public String toString() { if (!isEmpty()) { - return "[" + lower + ", " + upper + "]"; + return "[" + lower + ", " + upper + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { return "[<empty range>]"; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/ImageSelector.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/ImageSelector.java index f5fb9c528d..7c6d625a1f 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/ImageSelector.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/ImageSelector.java @@ -24,7 +24,7 @@ public interface ImageSelector { * The name of the CDOResource containing shared images at the top level of * the repo. */ - String IMAGES_RESOURCE_NAME = "images"; + String IMAGES_RESOURCE_NAME = "images"; //$NON-NLS-1$ /** * Get a image. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUI.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUI.java index df4ff519ee..98680b8f50 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUI.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUI.java @@ -27,7 +27,7 @@ public class DiagramDialectUI implements DialectUI { * {@inheritDoc} */ public String getName() { - return "diagram"; + return "diagram"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUIServices.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUIServices.java index b543f73273..abf98b0984 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUIServices.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/DiagramDialectUIServices.java @@ -249,7 +249,7 @@ public class DiagramDialectUIServices implements DialectUIServices { String viewpointsName = neededSirius.getName(); while (iterator.hasNext()) { neededSirius = iterator.next(); - viewpointsName += ", " + neededSirius.getName(); + viewpointsName += ", " + neededSirius.getName(); //$NON-NLS-1$ } final String description = viewpointsName; PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { @@ -556,7 +556,7 @@ public class DiagramDialectUIServices implements DialectUIServices { private IPath getRealPath(final IPath path, final boolean exportToHtml) { if (exportToHtml) { - return path.removeFileExtension().addFileExtension("html"); + return path.removeFileExtension().addFileExtension("html"); //$NON-NLS-1$ } else { return path; } @@ -738,7 +738,7 @@ public class DiagramDialectUIServices implements DialectUIServices { if (feature != null && feature.equals(ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION)) { StringBuilder sb = new StringBuilder(); sb.append(toolTipText); - String cr = "\n . "; + String cr = "\n . "; //$NON-NLS-1$ sb.append(cr + IInterpreterSiriusVariables.SOURCE_VIEW_PRE + ": diagram.EdgeTarget | (edge only) the source view of the current potential edge."); sb.append(cr + IInterpreterSiriusVariables.SOURCE_PRE + ": ecore.EObject | (edge only) the semantic element of $preSourceView."); sb.append(cr + IInterpreterSiriusVariables.TARGET_VIEW_PRE + ": diagram.EdgeTarget | (edge only) the target view of the current potential edge."); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/HierarchyLabelProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/HierarchyLabelProvider.java index e82693b955..0e3fc14ea7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/HierarchyLabelProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/dialect/HierarchyLabelProvider.java @@ -28,7 +28,7 @@ import org.eclipse.swt.graphics.Image; */ public class HierarchyLabelProvider extends LabelProvider { - private static final String DELIMITER = " > "; + private static final String DELIMITER = " > "; //$NON-NLS-1$ private ILabelProvider wrappedProvider; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/BorderSizeRepresentationFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/BorderSizeRepresentationFileMigrationParticipant.java index 3ea40f531a..5881d1c8af 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/BorderSizeRepresentationFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/BorderSizeRepresentationFileMigrationParticipant.java @@ -35,7 +35,7 @@ public class BorderSizeRepresentationFileMigrationParticipant extends AbstractRe /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("10.1.0.201507101000"); + private static final Version MIGRATION_VERSION = new Version("10.1.0.201507101000"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { @@ -54,8 +54,8 @@ public class BorderSizeRepresentationFileMigrationParticipant extends AbstractRe for (DDiagramElementContainer diagramElement : dDiagram.getContainers()) { if (diagramElement.getStyle() instanceof BorderedStyle) { BorderedStyle containerBorderedStyle = (BorderedStyle) diagramElement.getStyle(); - if ("0".equals(containerBorderedStyle.getBorderSizeComputationExpression())) { - containerBorderedStyle.setBorderSizeComputationExpression("1"); + if ("0".equals(containerBorderedStyle.getBorderSizeComputationExpression())) { //$NON-NLS-1$ + containerBorderedStyle.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ if (containerBorderedStyle.getBorderSize().intValue() == 0) { containerBorderedStyle.setBorderSize(1); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java index b5a04e73f3..abce6d108e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java @@ -48,7 +48,7 @@ import com.google.common.collect.Sets; */ public class CollapseSupportOnRegionMigrationParticipant extends AbstractRepresentationsFileMigrationParticipant { - private static final Version MIGRATION_VERSION = new Version("10.0.0.201505131200"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201505131200"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipant.java index 68b195a0e3..06b1497694 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipant.java @@ -38,9 +38,9 @@ public class DiagramRepresentationsFileMigrationParticipant extends AbstractRepr */ private static final Version MIGRATION_VERSION = DiagramRepresentationsFileMigrationParticipantV801.MIGRATION_VERSION; - private static final Version ALREADY_MIGRATED_VERSION = new Version("6.5.3"); + private static final Version ALREADY_MIGRATED_VERSION = new Version("6.5.3"); //$NON-NLS-1$ - private static final Version NOT_MIGRATED_VERSION = new Version("6.6.0"); + private static final Version NOT_MIGRATED_VERSION = new Version("6.6.0"); //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV650.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV650.java index 6fdea86ca2..c440491cb4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV650.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV650.java @@ -58,7 +58,7 @@ public class DiagramRepresentationsFileMigrationParticipantV650 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("6.5.0.201209041254"); + public static final Version MIGRATION_VERSION = new Version("6.5.0.201209041254"); //$NON-NLS-1$ /** * Predicate that checks that : diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV670.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV670.java index 0b7ea813a2..ea49be6279 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV670.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV670.java @@ -70,7 +70,7 @@ public class DiagramRepresentationsFileMigrationParticipantV670 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("6.7.0.201302181200"); + public static final Version MIGRATION_VERSION = new Version("6.7.0.201302181200"); //$NON-NLS-1$ private Predicate<Node> isBorderedNode = new IsBorderedNodePredicate(); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV680.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV680.java index 4df7043f13..a513a72e38 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV680.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV680.java @@ -42,7 +42,7 @@ public class DiagramRepresentationsFileMigrationParticipantV680 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("6.8.0.201307151200"); + public static final Version MIGRATION_VERSION = new Version("6.8.0.201307151200"); //$NON-NLS-1$ /** * Removes layout constraints from compartments. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV690.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV690.java index 8aa6b7ab2a..5b41d13d05 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV690.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV690.java @@ -46,7 +46,7 @@ public class DiagramRepresentationsFileMigrationParticipantV690 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("6.9.0.201309101020"); + public static final Version MIGRATION_VERSION = new Version("6.9.0.201309101020"); //$NON-NLS-1$ /** * Provides AdditionalLayer instead of OptionalLayer. @@ -60,7 +60,7 @@ public class DiagramRepresentationsFileMigrationParticipantV690 { */ public EClassifier getType(EPackage ePackage, String name) { Set<String> descriptionsNsUri = Sets.newHashSet(DescriptionPackage.eINSTANCE.getNsURI(), org.eclipse.sirius.viewpoint.description.DescriptionPackage.eINSTANCE.getNsURI()); - if (ePackage != null && ePackage.getNsURI() != null && descriptionsNsUri.contains(ePackage.getNsURI()) && name.equals("OptionalLayer")) { + if (ePackage != null && ePackage.getNsURI() != null && descriptionsNsUri.contains(ePackage.getNsURI()) && name.equals("OptionalLayer")) { //$NON-NLS-1$ return DescriptionPackage.eINSTANCE.getAdditionalLayer(); } return null; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV700.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV700.java index b0d4324f3e..48150f84fa 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV700.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV700.java @@ -29,7 +29,7 @@ public class DiagramRepresentationsFileMigrationParticipantV700 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("7.0.0"); + public static final Version MIGRATION_VERSION = new Version("7.0.0"); //$NON-NLS-1$ /** * Return "Sirius" instead of "Viewpoint" for the type of @@ -44,7 +44,7 @@ public class DiagramRepresentationsFileMigrationParticipantV700 { * @return a new value if has to be changed otherwise null. */ public Object getValue(EObject object, EStructuralFeature feature, Object value) { - if (NotationPackage.eINSTANCE.getView_Type().equals(feature) && NotationPackage.eINSTANCE.getDiagram().isInstance(object) && "Viewpoint".equals(value)) { + if (NotationPackage.eINSTANCE.getView_Type().equals(feature) && NotationPackage.eINSTANCE.getDiagram().isInstance(object) && "Viewpoint".equals(value)) { //$NON-NLS-1$ return DDiagramEditPart.MODEL_ID; } return null; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV801.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV801.java index 3adb3907f8..3ad8b809f3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV801.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramRepresentationsFileMigrationParticipantV801.java @@ -34,7 +34,7 @@ public class DiagramRepresentationsFileMigrationParticipantV801 { /** * The VP version for this migration. */ - public static final Version MIGRATION_VERSION = new Version("8.0.1"); + public static final Version MIGRATION_VERSION = new Version("8.0.1"); //$NON-NLS-1$ /** * We detected a case (see #426439) where a border node label is hidden (The diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramSplitMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramSplitMigrationParticipant.java index 5a51fa38b1..ddb6a53d37 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramSplitMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/DiagramSplitMigrationParticipant.java @@ -29,12 +29,12 @@ public class DiagramSplitMigrationParticipant extends AbstractMigrationParticipa /** * The version 8.0.0 corresponds to the file format of Sirius 1.0.0 M5. */ - private static final Version SIRIUS_1_0_0_M5_VERSION = new Version("8.0.0"); + private static final Version SIRIUS_1_0_0_M5_VERSION = new Version("8.0.0"); //$NON-NLS-1$ /** * The version 8.1.0 corresponds to the file format of Sirius 1.0.0 M6. */ - private static final Version SIRIUS_1_0_0_M6_VERSION = new Version("8.1.0"); + private static final Version SIRIUS_1_0_0_M6_VERSION = new Version("8.1.0"); //$NON-NLS-1$ public Version getMigrationVersion() { return SIRIUS_1_0_0_M6_VERSION; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/FontStyleForDNodeListElementMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/FontStyleForDNodeListElementMigrationParticipant.java index f5155e6e98..872699928d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/FontStyleForDNodeListElementMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/FontStyleForDNodeListElementMigrationParticipant.java @@ -41,7 +41,7 @@ import com.google.common.collect.Sets; */ public class FontStyleForDNodeListElementMigrationParticipant extends AbstractRepresentationsFileMigrationParticipant { - private static final Version MIGRATION_VERSION = new Version("10.0.0.201412231738"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201412231738"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/SetGMFViewsToNillMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/SetGMFViewsToNillMigrationParticipant.java index d9a0708cad..73fda8c15a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/SetGMFViewsToNillMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/SetGMFViewsToNillMigrationParticipant.java @@ -44,7 +44,7 @@ public class SetGMFViewsToNillMigrationParticipant extends AbstractRepresentatio /** * The VP version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("6.9.0.201309101020"); + public static final Version MIGRATION_VERSION = new Version("6.9.0.201309101020"); //$NON-NLS-1$ /** * diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/StyleCustomizationsRepresentationsFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/StyleCustomizationsRepresentationsFileMigrationParticipant.java index 4ef8e2660b..1b4138c1f8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/StyleCustomizationsRepresentationsFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/StyleCustomizationsRepresentationsFileMigrationParticipant.java @@ -28,7 +28,7 @@ public class StyleCustomizationsRepresentationsFileMigrationParticipant extends /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("6.5.0.201209191025"); + private static final Version MIGRATION_VERSION = new Version("6.5.0.201209191025"); //$NON-NLS-1$ /** * Overridden to migrate the custom feature of Style. @@ -40,7 +40,7 @@ public class StyleCustomizationsRepresentationsFileMigrationParticipant extends super.handleFeature(owner, unkownFeature, valueOfUnknownFeature); if (owner instanceof Style) { Style style = (Style) owner; - if ("custom".equals(unkownFeature.getName()) && valueOfUnknownFeature instanceof String && Boolean.parseBoolean((String) valueOfUnknownFeature)) { + if ("custom".equals(unkownFeature.getName()) && valueOfUnknownFeature instanceof String && Boolean.parseBoolean((String) valueOfUnknownFeature)) { //$NON-NLS-1$ style.getCustomFeatures().addAll(new CustomizableQuery(style).getCustomizableFeatureNames()); TreeIterator<EObject> eAllContents = style.eAllContents(); while (eAllContents.hasNext()) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/AcceleoExpressionsMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/AcceleoExpressionsMigrationParticipant.java index d35da2e711..a047d39adc 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/AcceleoExpressionsMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/AcceleoExpressionsMigrationParticipant.java @@ -27,12 +27,12 @@ import org.osgi.framework.Version; */ public class AcceleoExpressionsMigrationParticipant extends AbstractVSMMigrationParticipant { - private static final String OLD_EXPRESSION_DEFAULT_VALUE = "[eContents()->size()/]"; + private static final String OLD_EXPRESSION_DEFAULT_VALUE = "[eContents()->size()/]"; //$NON-NLS-1$ /** * The Sirius version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("10.0.0.201411061000"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201411061000"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java index 18b1144acc..75ede32a2e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java @@ -38,7 +38,7 @@ public class BorderSizeComputationExpressionMigrationParticipant extends Abstrac /** * The version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("10.1.0.201507101000"); + private static final Version MIGRATION_VERSION = new Version("10.1.0.201507101000"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { @@ -79,8 +79,8 @@ public class BorderSizeComputationExpressionMigrationParticipant extends Abstrac } private void migrateStyleOfContainerMapping(ContainerStyleDescription styleDescription) { - if (styleDescription != null && "0".equals(styleDescription.getBorderSizeComputationExpression())) { - styleDescription.setBorderSizeComputationExpression("1"); + if (styleDescription != null && "0".equals(styleDescription.getBorderSizeComputationExpression())) { //$NON-NLS-1$ + styleDescription.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/ListContainerAttributeMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/ListContainerAttributeMigrationParticipant.java index c00113ed4e..97eaedaac1 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/ListContainerAttributeMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/ListContainerAttributeMigrationParticipant.java @@ -30,7 +30,7 @@ public class ListContainerAttributeMigrationParticipant extends AbstractVSMMigra /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("6.7.0.201302071200"); + private static final Version MIGRATION_VERSION = new Version("6.7.0.201302071200"); //$NON-NLS-1$ public Version getMigrationVersion() { return MIGRATION_VERSION; @@ -42,7 +42,7 @@ public class ListContainerAttributeMigrationParticipant extends AbstractVSMMigra @Override protected void handleFeature(EObject owner, EStructuralFeature unkownFeature, Object valueOfUnknownFeature) { super.handleFeature(owner, unkownFeature, valueOfUnknownFeature); - if (owner instanceof ContainerMapping && "listContainer".equals(unkownFeature.getName())) { + if (owner instanceof ContainerMapping && "listContainer".equals(unkownFeature.getName())) { //$NON-NLS-1$ ContainerMapping mapping = (ContainerMapping) owner; if (valueOfUnknownFeature instanceof String && Boolean.parseBoolean((String) valueOfUnknownFeature)) { mapping.setChildrenPresentation(ContainerLayout.LIST); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/OptionalLayersVSMMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/OptionalLayersVSMMigrationParticipant.java index 6a68464b80..d54dfdcad2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/OptionalLayersVSMMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/OptionalLayersVSMMigrationParticipant.java @@ -36,7 +36,7 @@ public class OptionalLayersVSMMigrationParticipant extends AbstractVSMMigrationP /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("6.9.0.201308011200"); + private static final Version MIGRATION_VERSION = new Version("6.9.0.201308011200"); //$NON-NLS-1$ public Version getMigrationVersion() { return MIGRATION_VERSION; @@ -46,7 +46,7 @@ public class OptionalLayersVSMMigrationParticipant extends AbstractVSMMigrationP public EClassifier getType(EPackage ePackage, String name, String loadedVersion) { if (Version.parseVersion(loadedVersion).compareTo(MIGRATION_VERSION) < 0) { Set<String> descriptionsNsUri = Sets.newHashSet(DescriptionPackage.eINSTANCE.getNsURI(), org.eclipse.sirius.viewpoint.description.DescriptionPackage.eINSTANCE.getNsURI()); - if (ePackage != null && ePackage.getNsURI() != null && descriptionsNsUri.contains(ePackage.getNsURI()) && name.equals("OptionalLayer")) { + if (ePackage != null && ePackage.getNsURI() != null && descriptionsNsUri.contains(ePackage.getNsURI()) && name.equals("OptionalLayer")) { //$NON-NLS-1$ return DescriptionPackage.eINSTANCE.getAdditionalLayer(); } } @@ -56,7 +56,7 @@ public class OptionalLayersVSMMigrationParticipant extends AbstractVSMMigrationP @Override public EStructuralFeature getLocalElement(EClass eClass, String name, String loadedVersion) { if (Version.parseVersion(loadedVersion).compareTo(MIGRATION_VERSION) < 0) { - if (DescriptionPackage.eINSTANCE.getDiagramDescription().isSuperTypeOf(eClass) && name.equals("optionalLayers")) { + if (DescriptionPackage.eINSTANCE.getDiagramDescription().isSuperTypeOf(eClass) && name.equals("optionalLayers")) { //$NON-NLS-1$ return DescriptionPackage.eINSTANCE.getDiagramDescription_AdditionalLayers(); } } @@ -65,8 +65,8 @@ public class OptionalLayersVSMMigrationParticipant extends AbstractVSMMigrationP @Override public Option<String> getNewFragment(String uriFragment) { - if (uriFragment.contains("@optionalLayers")) { - String newUriFragment = uriFragment.replaceAll("@optionalLayers", "@additionalLayers"); + if (uriFragment.contains("@optionalLayers")) { //$NON-NLS-1$ + String newUriFragment = uriFragment.replaceAll("@optionalLayers", "@additionalLayers"); //$NON-NLS-1$ //$NON-NLS-2$ return Options.newSome(newUriFragment); } else { return super.getNewFragment(uriFragment); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/RoundedCornerDefaultValuesMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/RoundedCornerDefaultValuesMigrationParticipant.java index bdc779720e..2ab120bb68 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/RoundedCornerDefaultValuesMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/RoundedCornerDefaultValuesMigrationParticipant.java @@ -30,7 +30,7 @@ public class RoundedCornerDefaultValuesMigrationParticipant extends AbstractVSMM /** * The Sirius version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("10.0.0.201504091800"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201504091800"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/RequestQuery.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/RequestQuery.java index f88a046548..fb1d1edb3d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/RequestQuery.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/RequestQuery.java @@ -72,7 +72,7 @@ public class RequestQuery { if (request instanceof CreateViewRequest) { CreateViewRequest cvr = (CreateViewRequest) request; for (ViewDescriptor viewDesc : Iterables.filter(cvr.getViewDescriptors(), ViewDescriptor.class)) { - if ("Note".equals(viewDesc.getSemanticHint())) { + if ("Note".equals(viewDesc.getSemanticHint())) { //$NON-NLS-1$ isNoteCreationRequest = true; break; } @@ -92,7 +92,7 @@ public class RequestQuery { boolean isNoteAttachmentCreationRequest = false; if (request instanceof CreateConnectionViewRequest) { CreateConnectionViewRequest cvr = (CreateConnectionViewRequest) request; - isNoteAttachmentCreationRequest = "NoteAttachment".equals(cvr.getConnectionViewDescriptor().getSemanticHint()); + isNoteAttachmentCreationRequest = "NoteAttachment".equals(cvr.getConnectionViewDescriptor().getSemanticHint()); //$NON-NLS-1$ } return isNoteAttachmentCreationRequest; } @@ -109,7 +109,7 @@ public class RequestQuery { if (request instanceof CreateViewRequest) { CreateViewRequest cvr = (CreateViewRequest) request; for (ViewDescriptor viewDesc : Iterables.filter(cvr.getViewDescriptors(), ViewDescriptor.class)) { - if ("Text".equals(viewDesc.getSemanticHint())) { + if ("Text".equals(viewDesc.getSemanticHint())) { //$NON-NLS-1$ isTextCreationRequest = true; break; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/view/LayoutData.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/view/LayoutData.java index 32aa952f73..83027d2ed5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/view/LayoutData.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/view/LayoutData.java @@ -387,10 +387,10 @@ public class LayoutData extends AbstractLayoutData { public String toString() { String toString = getTarget().toString(); if (getLocation() != null) { - toString += ", " + getLocation().toString(); + toString += ", " + getLocation().toString(); //$NON-NLS-1$ } if (getSize() != null) { - toString += ", " + getSize().toString(); + toString += ", " + getSize().toString(); //$NON-NLS-1$ } return toString; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java index c1a9997c4c..ea36c92037 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java @@ -174,7 +174,7 @@ public abstract class AbstractDDiagramEditPart extends DiagramEditPart implement if (NotationPackage.eINSTANCE.getDiagram_PersistedEdges().equals(notification.getFeature()) || NotationPackage.eINSTANCE.getDiagram_TransientEdges().equals(notification.getFeature())) { if (notification.getOldValue() instanceof Edge) { final Edge oldValue = (Edge) notification.getOldValue(); - if ("NoteAttachment".equals(oldValue.getType())) { + if ("NoteAttachment".equals(oldValue.getType())) { //$NON-NLS-1$ refresh(); } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java index d77f9b8181..f9920179d2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramEdgeEditPart.java @@ -692,7 +692,7 @@ public abstract class AbstractDiagramEdgeEditPart extends ConnectionNodeEditPart if (AbstractDiagramEdgeEditPart.this.getTarget() != null) { return AbstractDiagramEdgeEditPart.this.getTarget().toString(); } else { - return "base"; + return "base"; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/AbstractDiagramNodeEditPartOperation.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/AbstractDiagramNodeEditPartOperation.java index 5693d8984b..998665ac90 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/AbstractDiagramNodeEditPartOperation.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/AbstractDiagramNodeEditPartOperation.java @@ -88,7 +88,7 @@ public final class AbstractDiagramNodeEditPartOperation { } if (notification.getEventType() == Notification.SET && notification.getFeature() instanceof EAttribute) { final EAttribute feature = (EAttribute) notification.getFeature(); - if ("visible".equals(feature.getName())) { + if ("visible".equals(feature.getName())) { //$NON-NLS-1$ final EditPart parent = self.getParent(); if (parent != null) { AbstractDiagramNodeEditPartOperation.safeRefresh(parent); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/DefaultDirectEditOperation.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/DefaultDirectEditOperation.java index 806c2a865a..8db6fbf2fb 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/DefaultDirectEditOperation.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/internal/part/DefaultDirectEditOperation.java @@ -282,7 +282,7 @@ public final class DefaultDirectEditOperation { text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); } if (text == null || text.length() == 0) { - text = ""; + text = ""; //$NON-NLS-1$ } return text; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/AbstractEdgeSelectionFeedbackEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/AbstractEdgeSelectionFeedbackEditPolicy.java index 00310ddf70..786be757e4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/AbstractEdgeSelectionFeedbackEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/AbstractEdgeSelectionFeedbackEditPolicy.java @@ -123,7 +123,7 @@ public abstract class AbstractEdgeSelectionFeedbackEditPolicy extends SelectionH protected List<Handle> createNameSelectionHandles() { final List<Handle> list = Lists.newArrayList(); for (AbstractDiagramNameEditPart edgeNameEditPart : getEdgeNameEditPart()) { - if (edgeNameEditPart != null && edgeNameEditPart.getEditText() != null && !"".equals(edgeNameEditPart.getEditText())) { + if (edgeNameEditPart != null && edgeNameEditPart.getEditText() != null && !"".equals(edgeNameEditPart.getEditText())) { //$NON-NLS-1$ NonResizableHandleKit.addMoveHandle(edgeNameEditPart, list); } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java index a14a781067..251951bff9 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java @@ -52,7 +52,7 @@ public class RegionContainerResizableEditPolicy extends AirResizableEditPolicy { /** * Key to store the part responsible for auto-size propagation. */ - protected static final String REGION_AUTO_SIZE_PROPAGATOR = "region_auto-size_propagator"; + protected static final String REGION_AUTO_SIZE_PROPAGATOR = "region_auto-size_propagator"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RevealSelectedElementsEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RevealSelectedElementsEditPolicy.java index 16cb3b7e1b..b0e60c93bb 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RevealSelectedElementsEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RevealSelectedElementsEditPolicy.java @@ -30,7 +30,7 @@ public class RevealSelectedElementsEditPolicy extends AbstractRevealElementEditP /** * Key where to find selected elements to reveal. */ - public static final String SELECTED_ELEMENTS_KEY = "selectedElements"; + public static final String SELECTED_ELEMENTS_KEY = "selectedElements"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusGraphicalNodeEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusGraphicalNodeEditPolicy.java index d5b334432b..1448ad5d6a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusGraphicalNodeEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusGraphicalNodeEditPolicy.java @@ -140,29 +140,29 @@ public class SiriusGraphicalNodeEditPolicy extends TreeGraphicalNodeEditPolicy { * Constant used to store a {@link EdgeCreationDescription} in a * Request.getExtendedData(). */ - protected static final String GMF_EDGE_CREATION_DESCRIPTION = "edge.creation.description"; + protected static final String GMF_EDGE_CREATION_DESCRIPTION = "edge.creation.description"; //$NON-NLS-1$ /** * Constant used to store the {@link EdgeTarget} source. */ - protected static final String GMF_EDGE_TARGET_SOURCE = "edgeTarget.source"; + protected static final String GMF_EDGE_TARGET_SOURCE = "edgeTarget.source"; //$NON-NLS-1$ /** * Constant used to store the location in GMF relative coordinates of the * click on the {@link EdgeTarget} source. */ - protected static final String GMF_EDGE_LOCATION_SOURCE = "edge.location.source"; + protected static final String GMF_EDGE_LOCATION_SOURCE = "edge.location.source"; //$NON-NLS-1$ /** * Constant use to store source terminal. */ - protected static final String GMF_EDGE_SOURCE_TERMINAL = "edge.newSourceTerminal"; + protected static final String GMF_EDGE_SOURCE_TERMINAL = "edge.newSourceTerminal"; //$NON-NLS-1$ /** * Constant use to store the feedback figure. This feedback figure is used * only when necessary (detection of potential straightened edge feedback). */ - protected static final String GMF_EDGE_FEEDBACK = "edge.feedback.figure"; + protected static final String GMF_EDGE_FEEDBACK = "edge.feedback.figure"; //$NON-NLS-1$ /** * Extra width edge for this feedback. @@ -803,8 +803,8 @@ public class SiriusGraphicalNodeEditPolicy extends TreeGraphicalNodeEditPolicy { final LayoutData targetLayoutData = new RootLayoutData(targetEditPart, targetLocation.getCopy(), null); EdgeLayoutData edgeLayoutData = new EdgeLayoutData(sourceLayoutData, targetLayoutData); - edgeLayoutData.setSourceTerminal("" + newSourceTerminal); - edgeLayoutData.setTargetTerminal("" + newTargetTerminal); + edgeLayoutData.setSourceTerminal("" + newSourceTerminal); //$NON-NLS-1$ + edgeLayoutData.setTargetTerminal("" + newTargetTerminal); //$NON-NLS-1$ edgeLayoutData.setPointList(pointList.getCopy()); edgeLayoutData.setSourceRefPoint(sourceRefPoint.getCopy()); @@ -878,12 +878,12 @@ public class SiriusGraphicalNodeEditPolicy extends TreeGraphicalNodeEditPolicy { PrecisionPoint sourceTerminalPosition = new PrecisionPoint((double) sourceLocationSnapIn100Percent.x / absoluteSourceBoundsIn100Percent.width, (double) sourceLocationSnapIn100Percent.y / absoluteSourceBoundsIn100Percent.height); String sourceTerminal = new SlidableAnchor(null, sourceTerminalPosition).getTerminal(); - edgeLayoutData.setSourceTerminal("" + sourceTerminal); + edgeLayoutData.setSourceTerminal("" + sourceTerminal); //$NON-NLS-1$ // Compute the new target terminal anchor PrecisionPoint targetTerminalPosition = new PrecisionPoint((double) targetLocationSnapIn100Percent.x / absoluteTargetBoundsIn100Percent.width, (double) targetLocationSnapIn100Percent.y / absoluteTargetBoundsIn100Percent.height); String targetTerminal = new SlidableAnchor(null, targetTerminalPosition).getTerminal(); - edgeLayoutData.setTargetTerminal("" + targetTerminal); + edgeLayoutData.setTargetTerminal("" + targetTerminal); //$NON-NLS-1$ // Applied the zoom of the current diagram to set the pointList, the // source reference point and the target reference point. PrecisionPoint absoluteSourceLocationSnap = new PrecisionPoint(absoluteSourceLocationSnapIn100Percent); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusPropertyHandlerEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusPropertyHandlerEditPolicy.java index cf7fcbefc3..dc4a67691e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusPropertyHandlerEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusPropertyHandlerEditPolicy.java @@ -174,7 +174,7 @@ public class SiriusPropertyHandlerEditPolicy extends PropertyHandlerEditPolicy { if (cpvr.getValue() instanceof Integer) { final RGB finalColor = FigureUtilities.integerToRGB((Integer) cpvr.getValue()); final UserFixedColor newColor = DescriptionFactory.eINSTANCE.createUserFixedColor(); - newColor.setName("<anonymous>"); + newColor.setName("<anonymous>"); //$NON-NLS-1$ newColor.setBlue(finalColor.blue); newColor.setGreen(finalColor.green); newColor.setRed(finalColor.red); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusResizeTracker.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusResizeTracker.java index 4f4ff5ebeb..ea49bbe11b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusResizeTracker.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SiriusResizeTracker.java @@ -31,7 +31,7 @@ public class SiriusResizeTracker extends ResizeTracker { * Constant passed to extended data of the request to keep the location of * the children of resized part fix. */ - public static final String CHILDREN_MOVE_MODE_KEY = "keepSameAbsoluteLocation"; + public static final String CHILDREN_MOVE_MODE_KEY = "keepSameAbsoluteLocation"; //$NON-NLS-1$ /** * The default mode for {@link #childrenMoveMode}. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SpecificBorderItemSelectionEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SpecificBorderItemSelectionEditPolicy.java index 4ac2470d65..0bf2f0d8b8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SpecificBorderItemSelectionEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/SpecificBorderItemSelectionEditPolicy.java @@ -101,7 +101,7 @@ public class SpecificBorderItemSelectionEditPolicy extends ResizableEditPolicyEx * corresponding to the move makes with the mouse. This allows to compute * correctly the new linked edges bendpoints to only move the last segment. */ - public static final String BORDER_NODE_REAL_LOCATION_KEY = "borderNodesRealLocation"; + public static final String BORDER_NODE_REAL_LOCATION_KEY = "borderNodesRealLocation"; //$NON-NLS-1$ /** * Key for extended data of request. This key corresponds to feedback @@ -109,7 +109,7 @@ public class SpecificBorderItemSelectionEditPolicy extends ResizableEditPolicyEx * border nodes are move simultaneously. The last moved figure is not added * to this list (because there will be no further feedback after this one). */ - private static final String BORDER_NODE_FEEDBACKS_KEY = "borderNodeFeedbacks"; + private static final String BORDER_NODE_FEEDBACKS_KEY = "borderNodeFeedbacks"; //$NON-NLS-1$ /** * We keep all created feedbacks to delete them at the end of the drag diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/CenterEdgeLayoutCommand.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/CenterEdgeLayoutCommand.java index 0412175d7d..104a392c3d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/CenterEdgeLayoutCommand.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/commands/CenterEdgeLayoutCommand.java @@ -45,7 +45,7 @@ public class CenterEdgeLayoutCommand extends AbstractTransactionalCommand { * the graphical edit part layouted. */ public CenterEdgeLayoutCommand(GraphicalEditPart graphicalEditPart) { - super(graphicalEditPart.getEditingDomain(), "", null); + super(graphicalEditPart.getEditingDomain(), "", null); //$NON-NLS-1$ editPart = graphicalEditPart; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DNodeNameEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DNodeNameEditPart.java index da36c343af..94b3d98807 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DNodeNameEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DNodeNameEditPart.java @@ -161,7 +161,7 @@ public class DNodeNameEditPart extends AbstractGeneratedDiagramNameEditPart impl * @was-generated */ public ViewNodeNameFigureDesc() { - this.setText("<...>"); + this.setText("<...>"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java index 375c716c26..9de2bd8a39 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/parsers/MessageFormatParser.java @@ -204,7 +204,7 @@ public class MessageFormatParser extends AbstractParser { final IInterpreter interpreter = SiriusPlugin.getDefault().getInterpreterRegistry().getInterpreter(element); String result = DiagramElementMappingHelper.computeInputLabelOfDirectEditLabel(((DDiagramElement) element), ((DDiagramElement) element).getParentDiagram(), directEditLabelTool, interpreter); - return result == null ? "" : result; + return result == null ? "" : result; //$NON-NLS-1$ } } return getEditorProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString(); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusMarkerNavigationProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusMarkerNavigationProvider.java index 2e558ceb33..18f130919d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusMarkerNavigationProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/providers/SiriusMarkerNavigationProvider.java @@ -101,7 +101,7 @@ public class SiriusMarkerNavigationProvider extends AbstractModelMarkerNavigatio marker = file.createMarker(MARKER_TYPE); marker.setAttribute(IMarker.MESSAGE, message); marker.setAttribute(IMarker.LOCATION, location); - marker.setAttribute("rule", EcoreUtil.getURI(validationRule).toString()); + marker.setAttribute("rule", EcoreUtil.getURI(validationRule).toString()); //$NON-NLS-1$ marker.setAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, elementId); int markerSeverity = IMarker.SEVERITY_INFO; if (statusSeverity == IStatus.WARNING) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/quickfix/DesignerResolutionGenerator.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/quickfix/DesignerResolutionGenerator.java index 0771b37c5b..71c7965e11 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/quickfix/DesignerResolutionGenerator.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/quickfix/DesignerResolutionGenerator.java @@ -31,7 +31,7 @@ public class DesignerResolutionGenerator implements IMarkerResolutionGenerator { * {@inheritDoc} */ public IMarkerResolution[] getResolutions(IMarker marker) { - final String validationRuleURI = marker.getAttribute("rule", null); + final String validationRuleURI = marker.getAttribute("rule", null); //$NON-NLS-1$ if (validationRuleURI != null) { final ValidationRule rule = fetchRuleFromURI(validationRuleURI); if (rule != null) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java index 68051039f1..5e8cdeadeb 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java @@ -414,7 +414,7 @@ public class ConnectionsFactory { // Use center anchor (because this is what is done // by the {@link // org.eclipse.sirius.diagram.ui.tools.internal.routers.DTreeRouter#getTrunkLocation(org.eclipse.draw2d.Connection)} - targetTerminal = "(0.5,0.5)"; + targetTerminal = "(0.5,0.5)"; //$NON-NLS-1$ } if (targetTerminal != null) { if (targetTerminal.length() == 0) diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/DDiagramCanonicalSynchronizer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/DDiagramCanonicalSynchronizer.java index ac67435991..5616cd4733 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/DDiagramCanonicalSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/DDiagramCanonicalSynchronizer.java @@ -382,7 +382,7 @@ public class DDiagramCanonicalSynchronizer extends AbstractCanonicalSynchronizer final Iterator<Edge> edges = diagram.getEdges().iterator(); while (edges.hasNext()) { final Edge currentEdge = edges.next(); - if ("NoteAttachment".equals(currentEdge.getType())) { + if ("NoteAttachment".equals(currentEdge.getType())) { //$NON-NLS-1$ result.add(currentEdge); } } @@ -402,7 +402,7 @@ public class DDiagramCanonicalSynchronizer extends AbstractCanonicalSynchronizer final Iterator<Edge> edges = diagram.getEdges().iterator(); while (edges.hasNext()) { final Edge currentEdge = edges.next(); - if ("line".equals(currentEdge.getType())) { + if ("line".equals(currentEdge.getType())) { //$NON-NLS-1$ result.add(currentEdge); } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ViewPropertiesSynchronizer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ViewPropertiesSynchronizer.java index e12f20e82d..eab89e159c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ViewPropertiesSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ViewPropertiesSynchronizer.java @@ -86,7 +86,7 @@ public class ViewPropertiesSynchronizer { GMF_TO_DDIAGRAMELEMENT_STYLE_FEATURES_MAPPING.put(NotationPackage.Literals.FONT_STYLE__FONT_HEIGHT, ViewpointPackage.Literals.BASIC_LABEL_STYLE__LABEL_SIZE); } - private static final String DEFAULT_FONT_STYLE = "Arial"; + private static final String DEFAULT_FONT_STYLE = "Arial"; //$NON-NLS-1$ /** * Update the specified GMF {@link View} properties according to Sirius diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/listeners/GMFBoundsUpdater.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/listeners/GMFBoundsUpdater.java index d3fc61a3ed..e0b4872cee 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/listeners/GMFBoundsUpdater.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/listeners/GMFBoundsUpdater.java @@ -123,7 +123,7 @@ public class GMFBoundsUpdater extends ResourceSetListenerImpl { } } isWorkspaceImageStyleResized = dDiagramElement.getStyle().getDescription() instanceof WorkspaceImageDescription - && ((WorkspaceImageDescription) dDiagramElement.getStyle().getDescription()).getSizeComputationExpression().equals("-1") && differentPath; + && ((WorkspaceImageDescription) dDiagramElement.getStyle().getDescription()).getSizeComputationExpression().equals("-1") && differentPath; //$NON-NLS-1$ return isWorkspaceImageStyleResized; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/ViewLocationHint.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/ViewLocationHint.java index 688af1e497..3ba2dcb5cd 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/ViewLocationHint.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/ViewLocationHint.java @@ -33,13 +33,13 @@ public final class ViewLocationHint { * The key to use to store the anchor location for the source end of a * connection. */ - public static final String SOURCE_ANCHOR_LOCATION = "sourceConnectionAnchorLocation"; + public static final String SOURCE_ANCHOR_LOCATION = "sourceConnectionAnchorLocation"; //$NON-NLS-1$ /** * The key to use to store the anchor location for the target end of a * connection. */ - public static final String TARGET_ANCHOR_LOCATION = "targetConnectionAnchorLocation"; + public static final String TARGET_ANCHOR_LOCATION = "targetConnectionAnchorLocation"; //$NON-NLS-1$ /** the shared instance. */ private static ViewLocationHint instance = new ViewLocationHint(); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java index 4137bbf64d..dc91f3b7c0 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java @@ -158,7 +158,7 @@ public class SiriusDiagramActionBarContributor extends DiagramActionBarContribut if (isOldUIEnabled()) { toolBarManager.add(getActionRegistry().getAction(REFRESH_DIAGRAM)); toolBarManager.add(new Separator()); - toolBarManager.add(new ConcernComboContributionItem(getPage(), "")); + toolBarManager.add(new ConcernComboContributionItem(getPage(), "")); //$NON-NLS-1$ toolBarManager.add(getActionRegistry().getAction(LAUNCH_BEHAVIOR)); toolBarManager.add(new Separator()); toolBarManager.add(new SiriusActionBarActionContributionItem(getActionRegistry().getAction(SetStyleToWorkspaceImageAction.SET_STYLE_TO_WORKSPACE_IMAGE_ACTION_ID), getPage())); @@ -235,7 +235,7 @@ public class SiriusDiagramActionBarContributor extends DiagramActionBarContribut cleanOldToolBarGMFAction(toolBarManager, ActionIds.ACTION_ROUTER_TREE); } else { Bundle uiWorkbenchBundle = Platform.getBundle("org.eclipse.ui.workbench"); //$NON-NLS-1$ - Version junoStart = Version.parseVersion("3.103"); + Version junoStart = Version.parseVersion("3.103"); //$NON-NLS-1$ // Version keplerStart = Version.parseVersion("3.105"); if (uiWorkbenchBundle != null && uiWorkbenchBundle.getVersion().compareTo(junoStart) < 0) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/ConcernComboContributionItem.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/ConcernComboContributionItem.java index 94fcf0f038..06f0eb48a4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/ConcernComboContributionItem.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/ConcernComboContributionItem.java @@ -55,7 +55,7 @@ public class ConcernComboContributionItem extends ContributionItem { /** * ID for concern contribution. */ - public static final String CONCERN_CONTRIBUTION_ID = "ConcernContribution"; + public static final String CONCERN_CONTRIBUTION_ID = "ConcernContribution"; //$NON-NLS-1$ private boolean forceSetText; @@ -187,7 +187,7 @@ public class ConcernComboContributionItem extends ContributionItem { combo.setEnabled(true); } } catch (final SWTException exception) { - if (!"gtk".equals(SWT.getPlatform())) { + if (!"gtk".equals(SWT.getPlatform())) { //$NON-NLS-1$ throw exception; } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/FindElementAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/FindElementAction.java index abc3683f9c..dd8291b929 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/FindElementAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/FindElementAction.java @@ -30,7 +30,7 @@ public class FindElementAction implements IObjectActionDelegate { /** * The action ID. */ - public static final String ID = "org.eclipse.sirius.transversal.find.ui.binding.FindElementAction"; + public static final String ID = "org.eclipse.sirius.transversal.find.ui.binding.FindElementAction"; //$NON-NLS-1$ private DiagramEditor currentPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/LaunchBehaviorContributionItem.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/LaunchBehaviorContributionItem.java index d9a8863939..b4b50ed7a2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/LaunchBehaviorContributionItem.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/action/LaunchBehaviorContributionItem.java @@ -46,7 +46,7 @@ public class LaunchBehaviorContributionItem extends ContributionItem { /** * ID for concern contribution. */ - public static final String CONCERN_CONTRIBUTION_ID = "ConcernContributionBehavior"; + public static final String CONCERN_CONTRIBUTION_ID = "ConcernContributionBehavior"; //$NON-NLS-1$ private final IPartService service; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/color/ColorManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/color/ColorManager.java index 8cd0cc6a0e..1efb7f9638 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/color/ColorManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/color/ColorManager.java @@ -68,13 +68,13 @@ public class ColorManager { } private String getKey(RGBValues color) { - StringBuilder sb = new StringBuilder("Color"); + StringBuilder sb = new StringBuilder("Color"); //$NON-NLS-1$ if (color != null) { - sb.append("_r:"); + sb.append("_r:"); //$NON-NLS-1$ sb.append(color.getRed()); - sb.append("_g:"); + sb.append("_g:"); //$NON-NLS-1$ sb.append(color.getGreen()); - sb.append("_b:"); + sb.append("_b:"); //$NON-NLS-1$ sb.append(color.getBlue()); } return sb.toString(); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java index a1972f6dc6..7400e47f83 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java @@ -40,7 +40,7 @@ public abstract class AbstractCachedSVGFigure extends SVGFigure implements Style /** * Key separator. */ - protected static final String SEPARATOR = "|"; + protected static final String SEPARATOR = "|"; //$NON-NLS-1$ /** * Soft cache to store svg. @@ -184,7 +184,7 @@ public abstract class AbstractCachedSVGFigure extends SVGFigure implements Style protected static String getImageNotFoundURI() { final String path = new StringBuffer(IMAGE_DIR).append(IMAGE_NOT_FOUND).append(IMAGE_EXT).toString(); String pluginId = DiagramUIPlugin.getPlugin().getSymbolicName(); - return "platform:/plugin/" + pluginId + "/" + path; + return "platform:/plugin/" + pluginId + "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/BundledImageFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/BundledImageFigure.java index 31c1e7d40d..3be0dcb60d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/BundledImageFigure.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/BundledImageFigure.java @@ -32,42 +32,42 @@ public class BundledImageFigure extends AbstractCachedSVGFigure { /** * The stroke tag in the SVG file. */ - private static final String SVG_STROKE = "stroke"; + private static final String SVG_STROKE = "stroke"; //$NON-NLS-1$ /** * The fill tag in the SVG file. */ - private static final String SVG_FILL = "fill"; + private static final String SVG_FILL = "fill"; //$NON-NLS-1$ /** * The stop-color tag in the SVG file. */ - private static final String SVG_STOP_COLOR = "stop-color"; + private static final String SVG_STOP_COLOR = "stop-color"; //$NON-NLS-1$ /** * The name of the style attribute in the SVG file. */ - private static final String SVG_STYLE_ATTRIBUTE_NAME = "style"; + private static final String SVG_STYLE_ATTRIBUTE_NAME = "style"; //$NON-NLS-1$ /** * The id of the lighter stop color of the gradient in the SVG file. */ - private static final String SVG_STOP_LIGHTER_ID = "stop1"; + private static final String SVG_STOP_LIGHTER_ID = "stop1"; //$NON-NLS-1$ /** * The id of the main stop color of the gradient in the SVG file. */ - private static final String SVG_STOP_MAIN_ID = "stop2"; + private static final String SVG_STOP_MAIN_ID = "stop2"; //$NON-NLS-1$ /** * The id of the gradient element in the SVG file. */ - private static final String SVG_GRADIENT_ELEMENT_ID = "elementWithGradient"; + private static final String SVG_GRADIENT_ELEMENT_ID = "elementWithGradient"; //$NON-NLS-1$ /** * The id of the shadow element in the SVG file. */ - private static final String SVG_SHADOW_ELEMENT_ID = "shadow"; + private static final String SVG_SHADOW_ELEMENT_ID = "shadow"; //$NON-NLS-1$ private static final String IMAGE_DIR = "images/"; //$NON-NLS-1$ @@ -236,7 +236,7 @@ public class BundledImageFigure extends AbstractCachedSVGFigure { private static String getImageFileURI(String shapeName) { final String path = new StringBuffer(IMAGE_DIR).append(shapeName).append(IMAGE_EXT).toString(); String pluginId = DiagramUIPlugin.getPlugin().getSymbolicName(); - return "platform:/plugin/" + pluginId + "/" + path; + return "platform:/plugin/" + pluginId + "/" + path; //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -245,7 +245,7 @@ public class BundledImageFigure extends AbstractCachedSVGFigure { * @return The hexa representation of the color. */ private static String getRGBValuesColorToHexa(final RGBValues color) { - String blankDigit = "0"; + String blankDigit = "0"; //$NON-NLS-1$ StringBuffer colorInHexa = new StringBuffer(); String hexaColor = Integer.toHexString(color.getRed()); if (hexaColor.length() == 1) { @@ -271,7 +271,7 @@ public class BundledImageFigure extends AbstractCachedSVGFigure { * @return The hexa representation of the color. */ private String getColorToHexa(Color color) { - String blankDigit = "0"; + String blankDigit = "0"; //$NON-NLS-1$ StringBuffer colorInHexa = new StringBuffer(); String hexaColor = Integer.toHexString(color.getRed()); if (hexaColor.length() == 1) { @@ -295,7 +295,7 @@ public class BundledImageFigure extends AbstractCachedSVGFigure { int indexOfColorAttribute = actualStyle.indexOf(colorAttribute); String newStyle = actualStyle.substring(0, indexOfColorAttribute + colorAttribute.length() + 2); newStyle = newStyle.concat(newColor); - newStyle = newStyle.concat(actualStyle.substring(actualStyle.indexOf(";", indexOfColorAttribute), actualStyle.length())); + newStyle = newStyle.concat(actualStyle.substring(actualStyle.indexOf(";", indexOfColorAttribute), actualStyle.length())); //$NON-NLS-1$ return newStyle; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/FoldingToggleImageFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/FoldingToggleImageFigure.java index c7a0a3b3cd..ccaff424e5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/FoldingToggleImageFigure.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/FoldingToggleImageFigure.java @@ -41,9 +41,9 @@ public class FoldingToggleImageFigure extends ActionTriggerImageFigure { */ protected static final int FOLD_ICON_HEIGHT = FOLD_ICON_WIDTH; - private static final Image MINUS_IMAGE = DiagramUIPlugin.getPlugin().getImage(DiagramUIPlugin.Implementation.getBundledImageDescriptor("/icons/collapse.gif")); + private static final Image MINUS_IMAGE = DiagramUIPlugin.getPlugin().getImage(DiagramUIPlugin.Implementation.getBundledImageDescriptor("/icons/collapse.gif")); //$NON-NLS-1$ - private static final Image PLUS_IMAGE = DiagramUIPlugin.getPlugin().getImage(DiagramUIPlugin.Implementation.getBundledImageDescriptor("/icons/expand.gif")); + private static final Image PLUS_IMAGE = DiagramUIPlugin.getPlugin().getImage(DiagramUIPlugin.Implementation.getBundledImageDescriptor("/icons/expand.gif")); //$NON-NLS-1$ private final IAbstractDiagramNodeEditPart part; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/GradientRoundedRectangle.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/GradientRoundedRectangle.java index 5967059e8f..670a348039 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/GradientRoundedRectangle.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/GradientRoundedRectangle.java @@ -80,7 +80,7 @@ public class GradientRoundedRectangle extends RoundedRectangle implements ViewNo */ protected void createContents() { fLabelFigure = new SiriusWrapLabel(); - fLabelFigure.setText(" "); + fLabelFigure.setText(" "); //$NON-NLS-1$ fLabelFigure.setTextWrap(true); this.add(fLabelFigure); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerParallelogram.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerParallelogram.java index 623053dbfb..26dbecef9b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerParallelogram.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerParallelogram.java @@ -34,7 +34,7 @@ public class ViewNodeContainerParallelogram extends ParallelogramFigure implemen private void createContents() { fContainerLabelFigure = new SiriusWrapLabel(); - fContainerLabelFigure.setText(" "); + fContainerLabelFigure.setText(" "); //$NON-NLS-1$ fContainerLabelFigure.setTextWrap(true); this.add(fContainerLabelFigure); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerRectangleFigureDesc.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerRectangleFigureDesc.java index 8a47832e8c..0b0d5d8649 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerRectangleFigureDesc.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/ViewNodeContainerRectangleFigureDesc.java @@ -36,7 +36,7 @@ public class ViewNodeContainerRectangleFigureDesc extends RectangleFigure implem private void createContents() { fContainerLabelFigure = new SiriusWrapLabel(); - fContainerLabelFigure.setText(" "); + fContainerLabelFigure.setText(" "); //$NON-NLS-1$ fContainerLabelFigure.setTextWrap(true); this.add(fContainerLabelFigure); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/graphical/edit/styles/SimpleStyleConfiguration.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/graphical/edit/styles/SimpleStyleConfiguration.java index 707332f97c..229ff3785d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/graphical/edit/styles/SimpleStyleConfiguration.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/graphical/edit/styles/SimpleStyleConfiguration.java @@ -237,15 +237,15 @@ public class SimpleStyleConfiguration implements StyleConfiguration { if (nodeLabel.getFont() != null) { final String text = node.getName(); - final float charHeight = FigureUtilities.getStringExtents("ABCDEF", nodeLabel.getFont()).height + 5f; - final float charWidth = FigureUtilities.getTextWidth("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", nodeLabel.getFont()) / 52f; + final float charHeight = FigureUtilities.getStringExtents("ABCDEF", nodeLabel.getFont()).height + 5f; //$NON-NLS-1$ + final float charWidth = FigureUtilities.getTextWidth("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", nodeLabel.getFont()) / 52f; //$NON-NLS-1$ final double ratio = charHeight / charWidth; final int nbLines = text != null ? (int) ((Math.sqrt(text.length()) / ratio)) + 1 : 0; int nbCols = text != null ? (int) ((Math.sqrt(text.length()) * ratio)) + 1 : 0; - final int longestWord = text != null ? this.getTheLongestWord(text.split("\\s")) : 0; + final int longestWord = text != null ? this.getTheLongestWord(text.split("\\s")) : 0; //$NON-NLS-1$ nbCols = Math.max(nbCols, longestWord); final int hHeight = (int) (nbLines * charHeight); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/LayoutUtils.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/LayoutUtils.java index 40d94cd946..1d583db80f 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/LayoutUtils.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/LayoutUtils.java @@ -449,7 +449,7 @@ public final class LayoutUtils { if (gmfDiag != null) { final DiagramEditPartService tool = new DiagramEditPartService(); - final DiagramEditPart diagramEditPart = tool.createDiagramEditPart(gmfDiag, shell, new PreferencesHint("DView")); + final DiagramEditPart diagramEditPart = tool.createDiagramEditPart(gmfDiag, shell, new PreferencesHint("DView")); //$NON-NLS-1$ diagramEditPart.refresh(); // performs an arrange all for canonical views. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/provider/AbstractLayoutProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/provider/AbstractLayoutProvider.java index 7c18a13d1a..538755e64a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/provider/AbstractLayoutProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/layout/provider/AbstractLayoutProvider.java @@ -157,7 +157,7 @@ public abstract class AbstractLayoutProvider extends AbstractLayoutEditPartProvi Command command = null; final AbstractLayoutEditPartProvider layoutProvider = diagramLayoutProvider.getLayoutNodeProvider(diagramEditPart); try { - final Method method = layoutProvider.getClass().getMethod("layoutEditParts", new Class[] { GraphicalEditPart.class, IAdaptable.class }); + final Method method = layoutProvider.getClass().getMethod("layoutEditParts", new Class[] { GraphicalEditPart.class, IAdaptable.class }); //$NON-NLS-1$ Assert.isNotNull(method); /* this code seems to avoid an infinite loop */ if (method.getDeclaringClass() != AbstractLayoutProvider.class) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/part/DiagramEditPartService.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/part/DiagramEditPartService.java index 2533cdf2fb..db5ec86203 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/part/DiagramEditPartService.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/part/DiagramEditPartService.java @@ -76,7 +76,7 @@ public class DiagramEditPartService extends org.eclipse.gmf.runtime.diagram.ui.r public static boolean canExportToHtml() { if (canExportToHtml == null) { try { - exportToHtmlClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToHTMLImageUtil"); + exportToHtmlClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToHTMLImageUtil"); //$NON-NLS-1$ canExportToHtml = true; } catch (ClassNotFoundException e) { canExportToHtml = false; @@ -159,7 +159,7 @@ public class DiagramEditPartService extends org.eclipse.gmf.runtime.diagram.ui.r List<?> editParts = diagramEP.getPrimaryEditParts(); org.eclipse.swt.graphics.Rectangle imageRect = gen.calculateImageRectangle(editParts); // Define max size in properties file. - int maxSize = Integer.parseInt(DiagramUIPlugin.INSTANCE.getString("_Pref_DiagramExportSizeMax")); + int maxSize = Integer.parseInt(DiagramUIPlugin.INSTANCE.getString("_Pref_DiagramExportSizeMax")); //$NON-NLS-1$ if (imageRect.height * imageRect.width > maxSize && format != ImageFileFormat.SVG) { String representationName = ((DSemanticDiagram) ((Diagram) diagramEP.getModel()).getElement()).getName(); throw new SizeTooLargeException(new Status(IStatus.ERROR, SiriusPlugin.ID, representationName)); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/properties/MiscPropertySection.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/properties/MiscPropertySection.java index da85a441ac..f9b94ddffd 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/properties/MiscPropertySection.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/properties/MiscPropertySection.java @@ -68,7 +68,7 @@ public class MiscPropertySection extends AdvancedPropertySection implements IPro if (next == null) { next = "null object"; } - propertyDescriptors[i] = new PropertyDescriptor(next, i + ""); + propertyDescriptors[i] = new PropertyDescriptor(next, i + ""); //$NON-NLS-1$ } propSrc = new DefaultPropertySource(propertyDescriptors); } else if (object != null) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/requests/RequestConstants.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/requests/RequestConstants.java index 825025b346..bf2cc08ce4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/requests/RequestConstants.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/requests/RequestConstants.java @@ -18,33 +18,33 @@ package org.eclipse.sirius.diagram.ui.tools.api.requests; public interface RequestConstants extends org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants { /** Refresh a viewpoint. */ - String REQ_REFRESH_VIEWPOINT = "refreshSirius"; + String REQ_REFRESH_VIEWPOINT = "refreshSirius"; //$NON-NLS-1$ /** Hide a given element. */ - String REQ_HIDE_ELEMENT = "hideElement"; + String REQ_HIDE_ELEMENT = "hideElement"; //$NON-NLS-1$ /** Reveal all hidden elements. */ - String REQ_REVEAL_ALLS = "revealAllElements"; + String REQ_REVEAL_ALLS = "revealAllElements"; //$NON-NLS-1$ /** Reveal selected hidden elements. */ - String REQ_REVEAL_SELECTED = "revealSelectedElements"; + String REQ_REVEAL_SELECTED = "revealSelectedElements"; //$NON-NLS-1$ /** Launch all rules. */ - String REQ_LAUNCH_RULE_TOOL = "launchRuleTools"; + String REQ_LAUNCH_RULE_TOOL = "launchRuleTools"; //$NON-NLS-1$ /** Delete this element from the diagram. */ - String REQ_DELETE_FROM_DIAGRAM = "deleteFromDiagram"; + String REQ_DELETE_FROM_DIAGRAM = "deleteFromDiagram"; //$NON-NLS-1$ /** Launch tool on diagram. */ - String REQ_LAUNCH_TOOL = "launchTool"; + String REQ_LAUNCH_TOOL = "launchTool"; //$NON-NLS-1$ /** request type for quotation rotation. */ - String REQ_ROTATE_BENDPOINT = "rotateBendpoint"; + String REQ_ROTATE_BENDPOINT = "rotateBendpoint"; //$NON-NLS-1$ /** request to distribute shapes. */ - String REQ_DISTRIBUTE = "distribute"; + String REQ_DISTRIBUTE = "distribute"; //$NON-NLS-1$ /** request to reset origin. */ - String REQ_RESET_ORIGIN = "resetOrigin"; + String REQ_RESET_ORIGIN = "resetOrigin"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java index f902a30708..1529ee694a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java @@ -27,22 +27,22 @@ public interface ActionIds { // CHECKSTYLE:ON /** Action contribution id for the copy layout. */ - String COPY_LAYOUT = "copyLayoutAction"; + String COPY_LAYOUT = "copyLayoutAction"; //$NON-NLS-1$ /** Action contribution id for the paste layout. */ - String PASTE_LAYOUT = "pasteLayoutAction"; + String PASTE_LAYOUT = "pasteLayoutAction"; //$NON-NLS-1$ /** Action id for pin elements action. */ - String PIN_ELEMENTS = "pinElementsAction"; + String PIN_ELEMENTS = "pinElementsAction"; //$NON-NLS-1$ /** Action id for unpin elements action. */ - String UNPIN_ELEMENTS = "unpinElementsAction"; + String UNPIN_ELEMENTS = "unpinElementsAction"; //$NON-NLS-1$ /** Action id for arrange bordered nodes action. */ - String ARRANGE_BORDERED_NODES = "arrangeBorderedNodesAction"; + String ARRANGE_BORDERED_NODES = "arrangeBorderedNodesAction"; //$NON-NLS-1$ /** Action id for arrange bordered nodes action. */ - String ARRANGE_BORDERED_NODES_TOOLBAR = "arrangeBorderedNodesActionToolBar"; + String ARRANGE_BORDERED_NODES_TOOLBAR = "arrangeBorderedNodesActionToolBar"; //$NON-NLS-1$ /** Action for copy (export) to an image action. */ String COPY_TO_IMAGE = "newCopyToImageAction"; //$NON-NLS-1$ @@ -51,30 +51,30 @@ public interface ActionIds { String MENU_ARRANGE = "arrangeMenu"; //$NON-NLS-1$ /** Action for show/hide elements. */ - String SELECT_HIDDEN_ELEMENTS = "selectHiddenElementsAction"; + String SELECT_HIDDEN_ELEMENTS = "selectHiddenElementsAction"; //$NON-NLS-1$ /** Action for show/hide elements. */ - String ROUTING_STYLE = "treeRoutingStyleAction"; + String ROUTING_STYLE = "treeRoutingStyleAction"; //$NON-NLS-1$ /** Action for Activating/Deactivating the Layouting mode. **/ - String SWITCH_LAYOUTING_MODE = "switchLayoutingMode"; + String SWITCH_LAYOUTING_MODE = "switchLayoutingMode"; //$NON-NLS-1$ /** Action to deselect all elements (select diagram). **/ - String DESELECT_ALL = "deselectAll"; + String DESELECT_ALL = "deselectAll"; //$NON-NLS-1$ /** Id of menu that groups distribute actions. **/ - String MENU_DISTRIBUTE = "distributeMenu"; + String MENU_DISTRIBUTE = "distributeMenu"; //$NON-NLS-1$ /** Action's id to distribute centers horizontally. */ - String DISTRIBUTE_CENTERS_HORIZONTALLY = RequestConstants.REQ_DISTRIBUTE + "CentersHorizontally"; + String DISTRIBUTE_CENTERS_HORIZONTALLY = RequestConstants.REQ_DISTRIBUTE + "CentersHorizontally"; //$NON-NLS-1$ /** Action's id to distribute horizontally with uniform gaps. */ - String DISTRIBUTE_GAPS_HORIZONTALLY = RequestConstants.REQ_DISTRIBUTE + "GapsHorizontally"; + String DISTRIBUTE_GAPS_HORIZONTALLY = RequestConstants.REQ_DISTRIBUTE + "GapsHorizontally"; //$NON-NLS-1$ /** Action's id to distribute centers vertically. */ - String DISTRIBUTE_CENTERS_VERTICALLY = RequestConstants.REQ_DISTRIBUTE + "CentersVertically"; + String DISTRIBUTE_CENTERS_VERTICALLY = RequestConstants.REQ_DISTRIBUTE + "CentersVertically"; //$NON-NLS-1$ /** Action's id to distribute vertically with uniform gaps. */ - String DISTRIBUTE_GAPS_VERTICALLY = RequestConstants.REQ_DISTRIBUTE + "GapsVertically"; + String DISTRIBUTE_GAPS_VERTICALLY = RequestConstants.REQ_DISTRIBUTE + "GapsVertically"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/util/GMFNotationHelper.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/util/GMFNotationHelper.java index 50639ee586..5d0103df0f 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/util/GMFNotationHelper.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/util/GMFNotationHelper.java @@ -126,7 +126,7 @@ public final class GMFNotationHelper { return ((ShapeStyle) obj).getDescription(); } } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/DeselectAllAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/DeselectAllAction.java index 4da2fa5e32..465a63aa68 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/DeselectAllAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/DeselectAllAction.java @@ -41,7 +41,7 @@ public class DeselectAllAction extends Action implements IObjectActionDelegate { public DeselectAllAction() { super(); setId(ActionIds.DESELECT_ALL); - setActionDefinitionId("org.eclipse.sirius.diagram.ui.command.deselectAll"); + setActionDefinitionId("org.eclipse.sirius.diagram.ui.command.deselectAll"); //$NON-NLS-1$ setAccelerator(SWT.ESC); setText("Deselect All"); setToolTipText("Deselect all selected diagram elements."); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SaveAsImageFileAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SaveAsImageFileAction.java index 74d6348c14..7d0768b0cd 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SaveAsImageFileAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SaveAsImageFileAction.java @@ -39,7 +39,7 @@ public class SaveAsImageFileAction extends AbstractExportRepresentationsAction { * Default constructor. */ public SaveAsImageFileAction() { - super("Export diagram as image", DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/screenshot.gif")); + super("Export diagram as image", DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/screenshot.gif")); //$NON-NLS-2$ /* set the id */ setId(ActionIds.COPY_TO_IMAGE); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectHiddenElementsAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectHiddenElementsAction.java index 6b9bf34299..f27738173b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectHiddenElementsAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectHiddenElementsAction.java @@ -98,7 +98,7 @@ public class SelectHiddenElementsAction extends AbstractDiagramAction { private static final String TOOLTIP = "Show/Hide"; - private static final String ICON_PATH = "icons/categoryWizard.gif"; + private static final String ICON_PATH = "icons/categoryWizard.gif"; //$NON-NLS-1$ /** The hide icon descriptor. */ private static final ImageDescriptor DESC_HIDE = DiagramUIPlugin.Implementation.getBundledImageDescriptor(ICON_PATH); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectPinnedElementsAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectPinnedElementsAction.java index 74a188feea..84bec07258 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectPinnedElementsAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SelectPinnedElementsAction.java @@ -82,7 +82,7 @@ public class SelectPinnedElementsAction extends AbstractDiagramAction { } } - private static final String ACTION_ID = "selectPinnedElementsAction"; + private static final String ACTION_ID = "selectPinnedElementsAction"; //$NON-NLS-1$ private static final String TITLE = "Diagram elements pinning"; @@ -90,7 +90,7 @@ public class SelectPinnedElementsAction extends AbstractDiagramAction { private static final String TOOLTIP = "Pin/Unpin"; - private static final String ICON_PATH = "icons/pinWizard.gif"; + private static final String ICON_PATH = "icons/pinWizard.gif"; //$NON-NLS-1$ /** The pin icon descriptor. */ private static final ImageDescriptor DESC_PIN = DiagramUIPlugin.Implementation.getBundledImageDescriptor(ICON_PATH); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromDiagramAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromDiagramAction.java index 711314ae71..d73c7d4fd7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromDiagramAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromDiagramAction.java @@ -69,7 +69,7 @@ public class DeleteFromDiagramAction extends RetargetAction implements IObjectAc * Constructor. */ public DeleteFromDiagramAction() { - super("", ""); + super("", ""); //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromModelAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromModelAction.java index 0a686551a0..02f9e51971 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromModelAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/delete/DeleteFromModelAction.java @@ -33,7 +33,7 @@ public class DeleteFromModelAction extends Action { * Constructor only for tests. */ public DeleteFromModelAction() { - super(""); + super(""); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/Identifier.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/Identifier.java index 6cd84924ba..0ecf2eab44 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/Identifier.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/repair/Identifier.java @@ -41,13 +41,13 @@ public final class Identifier { public static final Identifier EMPTY_ID = new Identifier(StringUtil.EMPTY_STRING); /** The extension point ID. */ - private static final String PROVIDERS_ID = "org.eclipse.sirius.diagram.ui.diagramIdentifierProvider"; + private static final String PROVIDERS_ID = "org.eclipse.sirius.diagram.ui.diagramIdentifierProvider"; //$NON-NLS-1$ /** The class attribute. */ - private static final String PROVIDERS_ATTRIBUTE = "providerClass"; + private static final String PROVIDERS_ATTRIBUTE = "providerClass"; //$NON-NLS-1$ /** The string target. */ - private static final String TARGET = "target"; + private static final String TARGET = "target"; //$NON-NLS-1$ /** All providers. */ private static List<IDiagramIdentifierProvider> allProviders; @@ -116,7 +116,7 @@ public final class Identifier { Identifier.checkNotNull(edge.getTarget(), TARGET); buffer.append(EcoreUtil.getURI(edge.getTarget())); - Identifier.checkNotNull(edge.getActualMapping(), "actualMapping"); + Identifier.checkNotNull(edge.getActualMapping(), "actualMapping"); //$NON-NLS-1$ buffer.append(EcoreUtil.getURI(edge.getActualMapping())); } } @@ -158,7 +158,7 @@ public final class Identifier { Identifier.checkNotNull(node.getTarget(), TARGET); buffer.append(EcoreUtil.getURI(node.getTarget())); - Identifier.checkNotNull(node.getMapping(), "mapping"); + Identifier.checkNotNull(node.getMapping(), "mapping"); //$NON-NLS-1$ buffer.append(EcoreUtil.getURI(node.getMapping())); } } @@ -178,7 +178,7 @@ public final class Identifier { Identifier.checkNotNull(edge.getTarget(), TARGET); buffer.append(EcoreUtil.getURI(edge.getTarget())); - Identifier.checkNotNull(edge.getMapping(), "mapping"); + Identifier.checkNotNull(edge.getMapping(), "mapping"); //$NON-NLS-1$ buffer.append(EcoreUtil.getURI(edge.getMapping())); } } @@ -204,7 +204,7 @@ public final class Identifier { } if (!(customizable.eContainer() instanceof DDiagramElement)) { EObject eContainer = customizable.eContainer(); - sb.append("." + eContainer.eContainingFeature().getName() + "."); + sb.append("." + eContainer.eContainingFeature().getName() + "."); //$NON-NLS-1$ //$NON-NLS-2$ } sb.append(customizable.eContainingFeature().getName()); if (customizable.eContainingFeature().isMany()) { @@ -212,7 +212,7 @@ public final class Identifier { if (list instanceof List<?>) { @SuppressWarnings("unchecked") List<?> values = (List<Object>) list; - sb.append("[" + values.indexOf(customizable) + "]"); + sb.append("[" + values.indexOf(customizable) + "]"); //$NON-NLS-1$ //$NON-NLS-2$ } } return new Identifier(sb); @@ -305,7 +305,7 @@ public final class Identifier { */ @Override public String toString() { - return "id: " + identifier; + return "id: " + identifier; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/style/ResetStylePropertiesToDefaultValuesAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/style/ResetStylePropertiesToDefaultValuesAction.java index d36b1b67ba..71e2bdfad3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/style/ResetStylePropertiesToDefaultValuesAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/style/ResetStylePropertiesToDefaultValuesAction.java @@ -51,7 +51,7 @@ public class ResetStylePropertiesToDefaultValuesAction extends Action implements public static final String ACTION_NAME = "Reset style properties to default values"; /** The action id. */ - public static final String ID = "RESET_STYLE_PROPERTIES_TO_DEFAULT_VALUES_ACTION_ID"; + public static final String ID = "RESET_STYLE_PROPERTIES_TO_DEFAULT_VALUES_ACTION_ID"; //$NON-NLS-1$ private IWorkbenchPage page; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusClipboardGlobalActionHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusClipboardGlobalActionHandler.java index f7f8810497..fb3d65ccc8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusClipboardGlobalActionHandler.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusClipboardGlobalActionHandler.java @@ -158,7 +158,7 @@ public class SiriusClipboardGlobalActionHandler extends ImageSupportGlobalAction // CreateViewRequest is internal in 3.3 and api in 3.5 Method method = null; try { - method = pasteReq.getClass().getMethod("getData"); + method = pasteReq.getClass().getMethod("getData"); //$NON-NLS-1$ } catch (SecurityException e) { // No method, no data } catch (NoSuchMethodException e) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusDefaultClipboardSupport.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusDefaultClipboardSupport.java index c13f8d529b..653c52266e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusDefaultClipboardSupport.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/clipboard/SiriusDefaultClipboardSupport.java @@ -109,7 +109,7 @@ public final class SiriusDefaultClipboardSupport extends AbstractClipboardSuppor public String copy() throws Exception { keepNotes(); if (getEObjects() == null || getEObjects().isEmpty()) - return ""; + return ""; //$NON-NLS-1$ return doCopy(); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialog.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialog.java index fe15e8f6ae..817148b027 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialog.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialog.java @@ -185,7 +185,7 @@ public class DiagramElementsSelectionDialog { private CustomTreeSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) { super(parent, labelProvider, contentProvider); - patternMatcher = new DiagramElementsSelectionDialogPatternMatcher(""); + patternMatcher = new DiagramElementsSelectionDialogPatternMatcher(""); //$NON-NLS-1$ } @Override @@ -774,7 +774,7 @@ public class DiagramElementsSelectionDialog { String msg = message; if (!Predicates.alwaysFalse().equals(isGrayed)) { StringBuilder sb = new StringBuilder(message); - sb.append("\n"); + sb.append("\n"); //$NON-NLS-1$ sb.append("The wizard will have no effect on grayed elements."); msg = sb.toString(); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialogPatternMatcher.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialogPatternMatcher.java index 1faf24a11e..bd15e5eef2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialogPatternMatcher.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/DiagramElementsSelectionDialogPatternMatcher.java @@ -46,16 +46,16 @@ public class DiagramElementsSelectionDialogPatternMatcher { public DiagramElementsSelectionDialogPatternMatcher(String expreg) { String computedExpreg = expreg; if (expreg == null) { - computedExpreg = ""; + computedExpreg = ""; //$NON-NLS-1$ } // If the regular expression ends with a space, we have to use the exact // value of the given expreg - if (computedExpreg.endsWith(" ")) { + if (computedExpreg.endsWith(" ")) { //$NON-NLS-1$ computedExpreg = computedExpreg.substring(0, computedExpreg.lastIndexOf(' ')); } else { // Otherwise, we add a star to make 'XYZ' recognized by the 'X' // expreg (as in quick outline for example) - computedExpreg = computedExpreg + "*"; + computedExpreg = computedExpreg + "*"; //$NON-NLS-1$ } this.stringMatcher = new StringMatcher(computedExpreg, true, false); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/ExtendedFeatureEditorDialog.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/ExtendedFeatureEditorDialog.java index efa07e0b65..da59ea61f1 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/ExtendedFeatureEditorDialog.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/dialogs/ExtendedFeatureEditorDialog.java @@ -297,7 +297,7 @@ public class ExtendedFeatureEditorDialog extends Dialog { choiceComposite.setLayout(layout); final Label choiceLabel = new Label(choiceComposite, SWT.NONE); - choiceLabel.setText(this.choices == null ? EMFEditUIPlugin.INSTANCE.getString("_UI_Value_label") : EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_label")); + choiceLabel.setText(this.choices == null ? EMFEditUIPlugin.INSTANCE.getString("_UI_Value_label") : EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_label")); //$NON-NLS-1$ //$NON-NLS-2$ final GridData choiceLabelGridData = new GridData(); choiceLabelGridData.verticalAlignment = SWT.FILL; choiceLabelGridData.horizontalAlignment = SWT.FILL; @@ -345,7 +345,7 @@ public class ExtendedFeatureEditorDialog extends Dialog { private Button createAddButton(final Composite controlButtons) { final Button addButton = new Button(controlButtons, SWT.PUSH); - addButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Add_label")); + addButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Add_label")); //$NON-NLS-1$ final GridData addButtonGridData = new GridData(); addButtonGridData.verticalAlignment = SWT.FILL; addButtonGridData.horizontalAlignment = SWT.FILL; @@ -355,7 +355,7 @@ public class ExtendedFeatureEditorDialog extends Dialog { private Button createRemoveButton(final Composite controlButtons) { final Button removeButton = new Button(controlButtons, SWT.PUSH); - removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label")); + removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label")); //$NON-NLS-1$ final GridData removeButtonGridData = new GridData(); removeButtonGridData.verticalAlignment = SWT.FILL; removeButtonGridData.horizontalAlignment = SWT.FILL; @@ -365,7 +365,7 @@ public class ExtendedFeatureEditorDialog extends Dialog { private Button createUpButton(final Composite controlButtons) { final Button upButton = new Button(controlButtons, SWT.PUSH); - upButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Up_label")); + upButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Up_label")); //$NON-NLS-1$ final GridData upButtonGridData = new GridData(); upButtonGridData.verticalAlignment = SWT.FILL; upButtonGridData.horizontalAlignment = SWT.FILL; @@ -375,7 +375,7 @@ public class ExtendedFeatureEditorDialog extends Dialog { private Button createDownButton(final Composite controlButtons) { final Button downButton = new Button(controlButtons, SWT.PUSH); - downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label")); + downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label")); //$NON-NLS-1$ final GridData downButtonGridData = new GridData(); downButtonGridData.verticalAlignment = SWT.FILL; downButtonGridData.horizontalAlignment = SWT.FILL; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java index c0abc4a248..8d674cf2df 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorImpl.java @@ -476,7 +476,7 @@ public class DDiagramEditorImpl extends SiriusDiagramEditor implements DDiagramE // when gotoMarker() method will be called if (input instanceof FileEditorInput) { IFile file = ((FileEditorInput) input).getFile(); - URI analysisURI = URI.createPlatformResourceURI("/" + file.getProject().getName() + "/" + file.getProjectRelativePath(), true); + URI analysisURI = URI.createPlatformResourceURI("/" + file.getProject().getName() + "/" + file.getProjectRelativePath(), true); //$NON-NLS-1$ //$NON-NLS-2$ return new SessionEditorInputFactory().create(analysisURI); } return input; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorSessionListenerDelegate.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorSessionListenerDelegate.java index c671305cba..fad172d938 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorSessionListenerDelegate.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DDiagramEditorSessionListenerDelegate.java @@ -44,13 +44,13 @@ public class DDiagramEditorSessionListenerDelegate implements Runnable { /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ private static final ImageDescriptor LOCK_BY_ME_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation - .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); + .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); //$NON-NLS-1$ /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ - private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); + private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); //$NON-NLS-1$ /** The NO_WRITE_PERMISSION icon description icon descriptor. */ - private static final ImageDescriptor NO_WRITE_PERMISSION_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_no_write.gif"); + private static final ImageDescriptor NO_WRITE_PERMISSION_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_no_write.gif"); //$NON-NLS-1$ private DDiagramEditorImpl dDiagramEditorImpl; @@ -264,7 +264,7 @@ public class DDiagramEditorSessionListenerDelegate implements Runnable { List<Object> images = new ArrayList<Object>(2); images.add(refreshImage); Image lockByOtherOverlayImage = SiriusEditPlugin.getPlugin() - .getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); + .getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); //$NON-NLS-1$ images.add(lockByOtherOverlayImage); ImageDescriptor composedImageDescriptor = new ComposedImageDescriptor(new ComposedImage(images)); frozenRepresentationImage = DiagramUIPlugin.getPlugin().getImage(composedImageDescriptor); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DiagramOutlinePage.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DiagramOutlinePage.java index 07663af2e1..504356189a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DiagramOutlinePage.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/DiagramOutlinePage.java @@ -81,9 +81,9 @@ public class DiagramOutlinePage extends AbstractExtendedContentOutlinePage { /** The id of the over view. 1 */ protected static final int ID_OVERVIEW = 1; - private static final String SIRIUS_DIAGRAM_OUTLINE_SHOW_OUTLINE = "sirius.diagram.outline.show.outline"; + private static final String SIRIUS_DIAGRAM_OUTLINE_SHOW_OUTLINE = "sirius.diagram.outline.show.outline"; //$NON-NLS-1$ - private static final String SIRIUS_DIAGRAM_OUTLINE_SHOW_OVERVIEW = "sirius.diagram.outline.show.overview"; + private static final String SIRIUS_DIAGRAM_OUTLINE_SHOW_OVERVIEW = "sirius.diagram.outline.show.overview"; //$NON-NLS-1$ /** The diagram workbench part. */ protected IDiagramWorkbenchPart diagramWorkbenchPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/IDiagramOutlinePage.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/IDiagramOutlinePage.java index 6af4f3ba0f..d221479272 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/IDiagramOutlinePage.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/IDiagramOutlinePage.java @@ -27,9 +27,9 @@ public interface IDiagramOutlinePage { String OUTLINE_VIEW_OVERVIEW_TIP_TEXT = "Overview"; //$NON-NLS-1$ /** The outline icon descriptor. */ - ImageDescriptor DESC_OUTLINE = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/outline.gif"); + ImageDescriptor DESC_OUTLINE = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/outline.gif"); //$NON-NLS-1$ /** the overview icon descriptor. */ - ImageDescriptor DESC_OVERVIEW = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/overview.gif"); + ImageDescriptor DESC_OVERVIEW = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/overview.gif"); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/header/DiagramHeaderComposite.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/header/DiagramHeaderComposite.java index 46e97810da..9eac0fb070 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/header/DiagramHeaderComposite.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/header/DiagramHeaderComposite.java @@ -240,7 +240,7 @@ public class DiagramHeaderComposite extends Composite { if (isRulerVisible) { // Add a blank label for the space take by the ruler. - createLabelInHeaderSection("", DiagramHeaderComposite.LEFT_RULER_WIDTH, VisualBindingManager.getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_SEPARATOR_BACKGROUND_COLOR), + createLabelInHeaderSection("", DiagramHeaderComposite.LEFT_RULER_WIDTH, VisualBindingManager.getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_SEPARATOR_BACKGROUND_COLOR), //$NON-NLS-1$ VisualBindingManager.getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_LABEL_COLOR)); } int previousXLocation = 0; @@ -257,7 +257,7 @@ public class DiagramHeaderComposite extends Composite { } int blankWidth = xLocation - (previousXLocation + previousWidth); if (blankWidth > 0) { - createLabelInHeaderSection("", blankWidth, VisualBindingManager.getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_SEPARATOR_BACKGROUND_COLOR), VisualBindingManager + createLabelInHeaderSection("", blankWidth, VisualBindingManager.getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_SEPARATOR_BACKGROUND_COLOR), VisualBindingManager //$NON-NLS-1$ .getDefault().getLabelColorFromRGBValues(HeaderData.DEFAULT_LABEL_COLOR)); } Color backgroundColor; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/AbstractTabbarFiller.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/AbstractTabbarFiller.java index 7aaf0488dc..ae0edf1cb4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/AbstractTabbarFiller.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/AbstractTabbarFiller.java @@ -112,7 +112,7 @@ public abstract class AbstractTabbarFiller implements TabbarFiller { // Get the menu service corresponding to the current site (and not the // current workbench window). IMenuService menuService = (IMenuService) part.getSite().getService(IMenuService.class); - menuService.populateContributionManager(manager, "toolbar:" + Tabbar.TABBAR_ID); + menuService.populateContributionManager(manager, "toolbar:" + Tabbar.TABBAR_ID); //$NON-NLS-1$ IToolBarContextService.INSTANCE.dispose(); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/FiltersContributionItem.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/FiltersContributionItem.java index 353ee0f1cb..58fe6dc726 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/FiltersContributionItem.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/FiltersContributionItem.java @@ -35,7 +35,7 @@ import org.eclipse.swt.graphics.Image; public class FiltersContributionItem extends AbstractMenuContributionItem { /** The filters icon descriptor. */ - private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); + private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java index 1962fc18b4..79790aeed5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java @@ -44,7 +44,7 @@ import com.google.common.collect.Iterables; public class LayersContribution extends AbstractMenuContributionItem { /** The layers icon descriptor. */ - private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); + private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); //$NON-NLS-1$ private LayersActivationAdapter adapter; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java index d4286d0f06..7aa8abbf88 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/Tabbar.java @@ -136,8 +136,8 @@ public class Tabbar extends Composite implements ISelectionListener, IAuthorityL // (both have 3.8 as version on the org.eclipse.core.runtime plugin). Bundle uiWorkbenchBundle = Platform.getBundle("org.eclipse.ui.workbench"); //$NON-NLS-1$ if (uiWorkbenchBundle != null) { - Version junoStart = Version.parseVersion("3.103"); - Version lunaStart = Version.parseVersion("3.106"); + Version junoStart = Version.parseVersion("3.103"); //$NON-NLS-1$ + Version lunaStart = Version.parseVersion("3.106"); //$NON-NLS-1$ Version currentVersion = uiWorkbenchBundle.getVersion(); // Range must not be in [3.103..3.106) diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithContributions.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithContributions.java index 21a2a43cd2..e08114977a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithContributions.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithContributions.java @@ -20,27 +20,27 @@ import org.eclipse.ui.IWorkbenchPage; */ public class TabbarFillerWithContributions extends AbstractTabbarFiller { - private static final String ARRANGE_SELECTION = "org.eclipse.sirius.diagram.ui.tabbar.arrangeselection"; + private static final String ARRANGE_SELECTION = "org.eclipse.sirius.diagram.ui.tabbar.arrangeselection"; //$NON-NLS-1$ - private static final String REFRESH = "org.eclipse.sirius.diagram.ui.tabbar.refresh"; + private static final String REFRESH = "org.eclipse.sirius.diagram.ui.tabbar.refresh"; //$NON-NLS-1$ - private static final String LAYER_FILTER = "org.eclipse.sirius.diagram.ui.tabbar.layerfilter"; + private static final String LAYER_FILTER = "org.eclipse.sirius.diagram.ui.tabbar.layerfilter"; //$NON-NLS-1$ - private static final String HIDE_PIN = "org.eclipse.sirius.diagram.ui.tabbar.hidepin"; + private static final String HIDE_PIN = "org.eclipse.sirius.diagram.ui.tabbar.hidepin"; //$NON-NLS-1$ - private static final String PAST = "org.eclipse.sirius.diagram.ui.tabbar.past"; + private static final String PAST = "org.eclipse.sirius.diagram.ui.tabbar.past"; //$NON-NLS-1$ - private static final String HIDE_DELETE = "org.eclipse.sirius.diagram.ui.tabbar.hidedelete"; + private static final String HIDE_DELETE = "org.eclipse.sirius.diagram.ui.tabbar.hidedelete"; //$NON-NLS-1$ - private static final String ZOOM = "org.eclipse.sirius.diagram.ui.tabbar.zoom"; + private static final String ZOOM = "org.eclipse.sirius.diagram.ui.tabbar.zoom"; //$NON-NLS-1$ - private static final String EXPORT = "org.eclipse.sirius.diagram.ui.tabbar.export"; + private static final String EXPORT = "org.eclipse.sirius.diagram.ui.tabbar.export"; //$NON-NLS-1$ - private static final String FONT = "org.eclipse.sirius.diagram.ui.tabbar.font"; + private static final String FONT = "org.eclipse.sirius.diagram.ui.tabbar.font"; //$NON-NLS-1$ - private static final String STYLE = "org.eclipse.sirius.diagram.ui.tabbar.style"; + private static final String STYLE = "org.eclipse.sirius.diagram.ui.tabbar.style"; //$NON-NLS-1$ - private static final String SIZE = "org.eclipse.sirius.diagram.ui.tabbar.size"; + private static final String SIZE = "org.eclipse.sirius.diagram.ui.tabbar.size"; //$NON-NLS-1$ /** * Construct a new instance. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java index 23a4275154..e08497658f 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/TabbarFillerWithoutContributions.java @@ -119,7 +119,7 @@ public class TabbarFillerWithoutContributions extends AbstractTabbarFiller { if (diagram != null) { DiagramDescription description = diagram.getDescription(); if (description != null && description.getConcerns() != null && description.getConcerns().getOwnedConcernDescriptions().size() > 1) { - ConcernComboContributionItem item = new ConcernComboContributionItem(page, ""); + ConcernComboContributionItem item = new ConcernComboContributionItem(page, ""); //$NON-NLS-1$ item.setDiagram(diagram); manager.add(item); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarAlignMenuManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarAlignMenuManager.java index 05e4c30c78..420205f0c8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarAlignMenuManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarAlignMenuManager.java @@ -98,7 +98,7 @@ public class TabbarAlignMenuManager extends AlignMenuManager { private void setHandler(final IAction defaultAction) { Method method; try { - method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); + method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); //$NON-NLS-1$ method.setAccessible(true); method.invoke(super.action, defaultAction); } catch (SecurityException e) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarArrangeMenuManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarArrangeMenuManager.java index fd8b820ada..128b2e4f23 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarArrangeMenuManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarArrangeMenuManager.java @@ -121,7 +121,7 @@ public class TabbarArrangeMenuManager extends ArrangeMenuManager implements ISel private void setHandler(final IAction defaultAction) { Method method; try { - method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); + method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); //$NON-NLS-1$ method.setAccessible(true); method.invoke(super.action, defaultAction); } catch (SecurityException e) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarColorPropertyContributionItem.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarColorPropertyContributionItem.java index 539d9b2f71..a4ccd29730 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarColorPropertyContributionItem.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarColorPropertyContributionItem.java @@ -75,9 +75,9 @@ public class TabbarColorPropertyContributionItem extends ColorPropertyContributi rgb = FigureUtilities.integerToRGB(Integer.parseInt(color)); } - TabbarColorPropertyContributionItem.setElement(this, new ColorMenuImageDescriptor(getBasicImageData(), rgb).createImage(), "overlyedImage"); + TabbarColorPropertyContributionItem.setElement(this, new ColorMenuImageDescriptor(getBasicImageData(), rgb).createImage(), "overlyedImage"); //$NON-NLS-1$ TabbarColorPropertyContributionItem.setElement(this, - new ColorMenuImageDescriptor((ImageData) TabbarColorPropertyContributionItem.getElement(this, "disabledBasicImageData"), rgb).createImage(), "disabledBasicImage"); + new ColorMenuImageDescriptor((ImageData) TabbarColorPropertyContributionItem.getElement(this, "disabledBasicImageData"), rgb).createImage(), "disabledBasicImage"); //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarDistributeMenuManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarDistributeMenuManager.java index b450f220f9..40493b0171 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarDistributeMenuManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarDistributeMenuManager.java @@ -83,7 +83,7 @@ public class TabbarDistributeMenuManager extends DistributeMenuManager { private void setHandler(final IAction defaultAction) { Method method; try { - method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); + method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); //$NON-NLS-1$ method.setAccessible(true); method.invoke(super.action, defaultAction); } catch (SecurityException e) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarRouterMenuManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarRouterMenuManager.java index ba22b22d4c..193a6d387a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarRouterMenuManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarRouterMenuManager.java @@ -85,7 +85,7 @@ public class TabbarRouterMenuManager extends RouterMenuManager { private void setHandler(final IAction defaultAction) { Method method; try { - method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); + method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); //$NON-NLS-1$ method.setAccessible(true); method.invoke(super.action, defaultAction); } catch (SecurityException e) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarSelectMenuManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarSelectMenuManager.java index 64af702fbf..de84bfe34c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarSelectMenuManager.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/actions/TabbarSelectMenuManager.java @@ -95,7 +95,7 @@ public class TabbarSelectMenuManager extends SelectMenuManager { private void setHandler(final IAction defaultAction) { Method method; try { - method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); + method = MenuCreatorAction.class.getDeclaredMethod("setActionHandler", IAction.class); //$NON-NLS-1$ method.setAccessible(true); method.invoke(super.action, defaultAction); } catch (SecurityException e) { @@ -120,7 +120,7 @@ public class TabbarSelectMenuManager extends SelectMenuManager { add(SelectAllAction.createToolbarSelectAllAction(page)); add(SelectAllAction.createToolbarSelectAllConnectionsAction(page)); add(SelectAllAction.createToolbarSelectAllShapesAction(page)); - setDefaultAction("toolbarSelectAllAction"); + setDefaultAction("toolbarSelectAllAction"); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java index 66fd73f739..51f498d2c6 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/AlignMenutExtensionContributionFactory.java @@ -27,7 +27,7 @@ public class AlignMenutExtensionContributionFactory extends SiriusTabbarExtensio super.createContributionItems(serviceLocator, additions); TabbarAlignMenuManager alignMenu = new TabbarAlignMenuManager(); - alignMenu.setDefaultAction("org.eclipse.gef.align_left"); + alignMenu.setDefaultAction("org.eclipse.gef.align_left"); //$NON-NLS-1$ additions.addContributionItem(alignMenu, new DDiagramElementTabbarExpression()); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java index c528e3f365..0b85ef0a3b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/ArrangeAllContributionFactory.java @@ -34,7 +34,7 @@ public class ArrangeAllContributionFactory extends SiriusTabbarExtensionContribu additions.addContributionItem(arrangeMenu, new DDiagramAndDDiagramElementTabbarExpression()); TabbarSelectMenuManager selectMenu = new TabbarSelectMenuManager(); - selectMenu.setDefaultAction("toolbarSelectAllAction"); + selectMenu.setDefaultAction("toolbarSelectAllAction"); //$NON-NLS-1$ additions.addContributionItem(selectMenu, new DDiagramTabbarExpression()); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java index 9e14068e06..7e86f56ae0 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/contributions/LayerFilterExtensionContributionFactory.java @@ -60,7 +60,7 @@ public class LayerFilterExtensionContributionFactory extends SiriusTabbarExtensi private void addConcernItem(final DDiagram diagram, final DiagramDescription description, IContributionRoot additions) { if (description.getConcerns() != null && !description.getConcerns().getOwnedConcernDescriptions().isEmpty() && description.getConcerns().getOwnedConcernDescriptions().size() != 1) { - ConcernComboContributionItem item = new ConcernComboContributionItem(getPage(), ""); + ConcernComboContributionItem item = new ConcernComboContributionItem(getPage(), ""); //$NON-NLS-1$ if (diagram != null) { item.setDiagram(diagram); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/DiagramSemanticElementLockedNotificationFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/DiagramSemanticElementLockedNotificationFigure.java index 209405d400..6ee1cbc1a7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/DiagramSemanticElementLockedNotificationFigure.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/DiagramSemanticElementLockedNotificationFigure.java @@ -61,10 +61,10 @@ public class DiagramSemanticElementLockedNotificationFigure extends Ellipse { /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ private static final ImageDescriptor LOCK_BY_ME_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation - .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); + .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); //$NON-NLS-1$ /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ - private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); + private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); //$NON-NLS-1$ /** * The transparency of this shape in percent. Must be in [0, 100] range. @@ -222,7 +222,7 @@ public class DiagramSemanticElementLockedNotificationFigure extends Ellipse { public static void createNotification(DiagramRootEditPart rootEditPart, LockStatus lockStatus) { final LayeredPane pane = (LayeredPane) rootEditPart.getLayer(LayerConstants.PRINTABLE_LAYERS); - final IFigure notificationFigure = new DiagramSemanticElementLockedNotificationFigure(rootEditPart, "", lockStatus); + final IFigure notificationFigure = new DiagramSemanticElementLockedNotificationFigure(rootEditPart, "", lockStatus); //$NON-NLS-1$ removeNotification(rootEditPart); pane.add(notificationFigure); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/LabelBorderStyleIds.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/LabelBorderStyleIds.java index b2a6d16da3..b87081f823 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/LabelBorderStyleIds.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/LabelBorderStyleIds.java @@ -19,19 +19,19 @@ public final class LabelBorderStyleIds { /** * Returns the identifier used for beveled corners. */ - public static final String LABEL_BORDER_STYLE_WITH_BEVELED_CORNERS_ID = "labelBorderStyleWithBeveledCorner"; + public static final String LABEL_BORDER_STYLE_WITH_BEVELED_CORNERS_ID = "labelBorderStyleWithBeveledCorner"; //$NON-NLS-1$ /** * Returns the identifier used for border style description for container. * This impacts the container content pane: it starts after the label. */ - public static final String LABEL_FULL_BORDER_STYLE_FOR_CONTAINER_ID = "labelBorderForContainer"; + public static final String LABEL_FULL_BORDER_STYLE_FOR_CONTAINER_ID = "labelBorderForContainer"; //$NON-NLS-1$ /** * Returns the identifier used for the no label border style for lists. No * impact on content panes. */ - public static final String NO_LABEL_BORDER_STYLE_FOR_LISTS_ID = "nolabelBorderForList"; + public static final String NO_LABEL_BORDER_STYLE_FOR_LISTS_ID = "nolabelBorderForList"; //$NON-NLS-1$ /** * Avoid instantiation from external. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/InferringNamespaceContext.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/InferringNamespaceContext.java index a0dec32423..96fb5356d0 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/InferringNamespaceContext.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/InferringNamespaceContext.java @@ -48,17 +48,17 @@ public class InferringNamespaceContext implements NamespaceContext { int type; while ((null != parent) && (null == namespace) && (((type = parent.getNodeType()) == Node.ELEMENT_NODE) || (type == Node.ENTITY_REFERENCE_NODE))) { if (type == Node.ELEMENT_NODE) { - if (parent.getNodeName().indexOf(prefix + ":") == 0) { + if (parent.getNodeName().indexOf(prefix + ":") == 0) { //$NON-NLS-1$ return parent.getNamespaceURI(); } NamedNodeMap nnm = parent.getAttributes(); for (int i = 0; i < nnm.getLength(); i++) { Node attr = nnm.item(i); String aname = attr.getNodeName(); - boolean isPrefix = aname.startsWith("xmlns:"); - if (isPrefix || aname.equals("xmlns")) { + boolean isPrefix = aname.startsWith("xmlns:"); //$NON-NLS-1$ + if (isPrefix || aname.equals("xmlns")) { //$NON-NLS-1$ int index = aname.indexOf(':'); - String p = isPrefix ? aname.substring(index + 1) : ""; + String p = isPrefix ? aname.substring(index + 1) : ""; //$NON-NLS-1$ if (p.equals(prefix)) { namespace = attr.getNodeValue(); break; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/find/BasicFindLabelEngine.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/find/BasicFindLabelEngine.java index d532bb6338..7652c03eb4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/find/BasicFindLabelEngine.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/find/BasicFindLabelEngine.java @@ -108,7 +108,7 @@ public class BasicFindLabelEngine extends AbstractFindLabelEngine { private String getText(final AbstractGraphicalEditPart label) { final IFigure figure = label.getFigure(); final String text = getText(figure); - return text != null ? text : ""; + return text != null ? text : ""; //$NON-NLS-1$ } private String getText(final IFigure figure) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ChangeBoundRequestRecorderEditPolicyProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ChangeBoundRequestRecorderEditPolicyProvider.java index b681087ae6..cd672bd076 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ChangeBoundRequestRecorderEditPolicyProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ChangeBoundRequestRecorderEditPolicyProvider.java @@ -32,7 +32,7 @@ import org.eclipse.sirius.diagram.ui.tools.internal.part.SiriusDiagramGraphicalV public class ChangeBoundRequestRecorderEditPolicyProvider implements IEditPolicyProvider { /** The role of the request. */ - private static final String RECORD_REQUEST_ROLE = "RecordRequest"; + private static final String RECORD_REQUEST_ROLE = "RecordRequest"; //$NON-NLS-1$ /** the property change support. */ private final List<IProviderChangeListener> listeners; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ContainerCompartmentNodeEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ContainerCompartmentNodeEditPolicy.java index 438fb2ed1c..a7fdc68ef7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ContainerCompartmentNodeEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/ContainerCompartmentNodeEditPolicy.java @@ -72,7 +72,7 @@ public class ContainerCompartmentNodeEditPolicy extends ContainerNodeEditPolicy @Override public EditPart getTargetEditPart(Request request) { if (REQ_CONNECTION_START.equals(request.getType()) && request instanceof CreateConnectionViewRequest - && "NoteAttachment".equals(((CreateConnectionViewRequest) request).getConnectionViewDescriptor().getSemanticHint())) { + && "NoteAttachment".equals(((CreateConnectionViewRequest) request).getConnectionViewDescriptor().getSemanticHint())) { //$NON-NLS-1$ // The note attachment requires a INodeEditPart as source. return getHost().getParent(); } else { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/MyNiceCustomBarPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/MyNiceCustomBarPolicy.java index 63f4f9a59e..a98ac70053 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/MyNiceCustomBarPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/MyNiceCustomBarPolicy.java @@ -62,10 +62,10 @@ import com.google.common.collect.Iterables; public class MyNiceCustomBarPolicy extends DiagramAssistantEditPolicy implements LayerConstants { /** The layers icon descriptor. */ - private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); + private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); //$NON-NLS-1$ /** The filters icon descriptor. */ - private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); + private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); //$NON-NLS-1$ private static final ImageDescriptor DESC_ACTIVE_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor(DiagramImagesPath.ACTIVE_LAYER_ICON); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/SiriusConnectionEndPointEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/SiriusConnectionEndPointEditPolicy.java index 1331598a80..b9f749aaca 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/SiriusConnectionEndPointEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/policies/SiriusConnectionEndPointEditPolicy.java @@ -166,13 +166,13 @@ public class SiriusConnectionEndPointEditPolicy extends ConnectionEndpointEditPo try { // Unfortunately, the vectors (stored as dimensions) and weight // of Draw2D RelativeBendpoint is not accessible - Field dimension1Field = RelativeBendpoint.class.getDeclaredField("d1"); + Field dimension1Field = RelativeBendpoint.class.getDeclaredField("d1"); //$NON-NLS-1$ boolean dim1Accessibility = dimension1Field.isAccessible(); dimension1Field.setAccessible(true); - Field dimension2Field = RelativeBendpoint.class.getDeclaredField("d2"); + Field dimension2Field = RelativeBendpoint.class.getDeclaredField("d2"); //$NON-NLS-1$ boolean dim2Accessibility = dimension1Field.isAccessible(); dimension2Field.setAccessible(true); - Field weightField = RelativeBendpoint.class.getDeclaredField("weight"); + Field weightField = RelativeBendpoint.class.getDeclaredField("weight"); //$NON-NLS-1$ boolean weightAccessibility = dimension1Field.isAccessible(); weightField.setAccessible(true); for (int i = 0; i < originListBendpoint.size(); i++) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/styles/StyleConfigurationRegistry.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/styles/StyleConfigurationRegistry.java index 09dc817d8a..96930d01de 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/styles/StyleConfigurationRegistry.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/graphical/edit/styles/StyleConfigurationRegistry.java @@ -63,7 +63,7 @@ public final class StyleConfigurationRegistry extends SessionManagerListener.Stu private static final String STYLE_CONFIGURATION_PROVIDER_EXTENSION_POINT = "org.eclipse.sirius.diagram.ui.styleConfigurationProvider"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "styleConfigurationProvider"; + private static final String TAG_ENGINE = "styleConfigurationProvider"; //$NON-NLS-1$ static { StyleConfigurationRegistry.parseExtensionMetadata(); @@ -97,7 +97,7 @@ public final class StyleConfigurationRegistry extends SessionManagerListener.Stu for (IConfigurationElement configElement : configElements) { if (configElement.getName().equals(TAG_ENGINE)) { try { - final IStyleConfigurationProvider styleConfigurationProvider = (IStyleConfigurationProvider) configElement.createExecutableExtension("providerClass"); + final IStyleConfigurationProvider styleConfigurationProvider = (IStyleConfigurationProvider) configElement.createExecutableExtension("providerClass"); //$NON-NLS-1$ StyleConfigurationRegistry.styleConfigurationProviders.add(styleConfigurationProvider); } catch (final CoreException e) { DiagramPlugin.getDefault().logError("Impossible to load the style configuration provider : " + configElement.getName(), e); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/PinnedElementsHandler.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/PinnedElementsHandler.java index 6342d13e09..15885e2eed 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/PinnedElementsHandler.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/PinnedElementsHandler.java @@ -873,36 +873,36 @@ public class PinnedElementsHandler { @SuppressWarnings("unused") private void printInitialState() { - debugMessage("==============================================================================="); - debugMessage("Initial state (before #resolveOverlaps()"); - debugMessage("----------------------------------------"); + debugMessage("==============================================================================="); //$NON-NLS-1$ + debugMessage("Initial state (before #resolveOverlaps()"); //$NON-NLS-1$ + debugMessage("----------------------------------------"); //$NON-NLS-1$ for (IGraphicalEditPart part : allEditParts) { - debugMessage("- " + part.getClass().getSimpleName() + " (semantic: " + part.resolveSemanticElement() + ")"); - debugMessage(" Pinned: " + isPinned.apply(part)); - debugMessage(" Intrinsic bounds (main figure): " + part.getFigure().getBounds()); - debugMessage(" Initial bounds (after previous layout pass): " + getInitialBounds(part)); + debugMessage("- " + part.getClass().getSimpleName() + " (semantic: " + part.resolveSemanticElement() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + debugMessage(" Pinned: " + isPinned.apply(part)); //$NON-NLS-1$ + debugMessage(" Intrinsic bounds (main figure): " + part.getFigure().getBounds()); //$NON-NLS-1$ + debugMessage(" Initial bounds (after previous layout pass): " + getInitialBounds(part)); //$NON-NLS-1$ } - debugMessage(""); + debugMessage(""); //$NON-NLS-1$ } @SuppressWarnings("unused") private void printResolvedState() { - debugMessage("Solution (only moved elements)"); - debugMessage("------------------------------"); + debugMessage("Solution (only moved elements)"); //$NON-NLS-1$ + debugMessage("------------------------------"); //$NON-NLS-1$ for (IGraphicalEditPart part : currentBounds.keySet()) { - debugMessage("- " + part.getClass().getSimpleName() + " (semantic: " + part.resolveSemanticElement() + ")"); - debugMessage(" Pinned: " + isPinned.apply(part)); - debugMessage(" Intrinsic bounds (main figure): " + part.getFigure().getBounds()); - debugMessage(" Initial bounds (after previous layout pass): " + getInitialBounds(part)); - debugMessage(" Computed bounds (after resolution): " + getCurrentPosition(part)); + debugMessage("- " + part.getClass().getSimpleName() + " (semantic: " + part.resolveSemanticElement() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + debugMessage(" Pinned: " + isPinned.apply(part)); //$NON-NLS-1$ + debugMessage(" Intrinsic bounds (main figure): " + part.getFigure().getBounds()); //$NON-NLS-1$ + debugMessage(" Initial bounds (after previous layout pass): " + getInitialBounds(part)); //$NON-NLS-1$ + debugMessage(" Computed bounds (after resolution): " + getCurrentPosition(part)); //$NON-NLS-1$ } - debugMessage(""); + debugMessage(""); //$NON-NLS-1$ } private void debugMessage(final String msg) { if (DEBUG) { // CHECKSTYLE:OFF - System.out.println("DEBUG: " + msg); + System.out.println("DEBUG: " + msg); //$NON-NLS-1$ // CHECKSTYLE:ON } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/data/extension/LayoutDataManagerDescriptor.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/data/extension/LayoutDataManagerDescriptor.java index 496913cd5a..01c9d2ba68 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/data/extension/LayoutDataManagerDescriptor.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/data/extension/LayoutDataManagerDescriptor.java @@ -28,12 +28,12 @@ public class LayoutDataManagerDescriptor { /** * Name of the attribute corresponding to the contributed class's path. */ - public static final String LAYOUT_DATA_MANAGER_PROVIDER_CLASS_NAME = "class"; + public static final String LAYOUT_DATA_MANAGER_PROVIDER_CLASS_NAME = "class"; //$NON-NLS-1$ /** * Name of the attribute corresponding to the contributed id. */ - public static final String LAYOUT_DATA_MANAGER_PROVIDER_ID = "icon"; + public static final String LAYOUT_DATA_MANAGER_PROVIDER_ID = "icon"; //$NON-NLS-1$ /** * Configuration element of this descriptor . diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ordering/ViewOrderingProviderRegistry.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ordering/ViewOrderingProviderRegistry.java index 822e812e67..4ad95802d6 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ordering/ViewOrderingProviderRegistry.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ordering/ViewOrderingProviderRegistry.java @@ -37,7 +37,7 @@ public final class ViewOrderingProviderRegistry { private static final String VIEW_ORDERING_PROVIDER_EXTENSION_POINT = "org.eclipse.sirius.diagram.ui.viewOrderingProvider"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "viewOrderingProvider"; + private static final String TAG_ENGINE = "viewOrderingProvider"; //$NON-NLS-1$ /** The providers. */ private Collection<ViewOrderingProvider> viewOrderingProviders; @@ -62,7 +62,7 @@ public final class ViewOrderingProviderRegistry { for (IConfigurationElement configElement : configElements) { if (configElement.getName().equals(TAG_ENGINE)) { try { - final ViewOrderingProvider viewOrderingProvider = (ViewOrderingProvider) configElement.createExecutableExtension("providerClass"); + final ViewOrderingProvider viewOrderingProvider = (ViewOrderingProvider) configElement.createExecutableExtension("providerClass"); //$NON-NLS-1$ this.viewOrderingProviders.add(viewOrderingProvider); } catch (final CoreException e) { DiagramPlugin.getDefault().logError("Impossible to load the view ordering provider : " + configElement.getName(), e); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/LayoutService.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/LayoutService.java index c3bbd61958..4ad5cc9c5d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/LayoutService.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/LayoutService.java @@ -40,7 +40,7 @@ public final class LayoutService { private static final String LAYOUT_PROVIDER_EXTENSION_POINT = "org.eclipse.sirius.diagram.ui.layoutProvider"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "layoutProvider"; + private static final String TAG_ENGINE = "layoutProvider"; //$NON-NLS-1$ /** * Avoid instantiation. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/semantic/AbstractSemanticLayoutDataKey.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/semantic/AbstractSemanticLayoutDataKey.java index 0c3849dde3..1804186372 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/semantic/AbstractSemanticLayoutDataKey.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/semantic/AbstractSemanticLayoutDataKey.java @@ -81,7 +81,7 @@ public abstract class AbstractSemanticLayoutDataKey implements LayoutDataKey, Co */ @Override public String toString() { - return "Key ID: " + getId(); + return "Key ID: " + getId(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java index 5512c07e90..875870f0a9 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java @@ -48,11 +48,11 @@ import org.eclipse.ui.IWorkbenchPart; */ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider { - private static final String DELETE_FROM_GROUP = "deleteFromGroup"; + private static final String DELETE_FROM_GROUP = "deleteFromGroup"; //$NON-NLS-1$ - private static final String PIN_GROUP = "pinGroup"; + private static final String PIN_GROUP = "pinGroup"; //$NON-NLS-1$ - private static final String FILTER_FORMAT_GROUP = "filterFormatGroup"; + private static final String FILTER_FORMAT_GROUP = "filterFormatGroup"; //$NON-NLS-1$ private static final String ARRANGE_MENU_ERROR = "Arrange menu is not renamed in Layout"; @@ -314,7 +314,7 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider private void updateArrangeMenuName(final IMenuManager arrangeMenu) { try { Class<? extends IMenuManager> arrangeMenuClass = arrangeMenu.getClass(); - Field field = arrangeMenuClass.getDeclaredField("realMenuManager"); + Field field = arrangeMenuClass.getDeclaredField("realMenuManager"); //$NON-NLS-1$ field.setAccessible(true); Object realMenuManager = field.get(arrangeMenu); if (realMenuManager instanceof ActionMenuManager) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java index 24719d5c0e..98ea1a2e4b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/OpenMenuContribution.java @@ -67,7 +67,7 @@ import org.eclipse.ui.IWorkbenchPart; */ public class OpenMenuContribution implements IContributionItemProvider { - private static final String MENU_OPEN_REPRESENTATION_ID = "popup.open"; + private static final String MENU_OPEN_REPRESENTATION_ID = "popup.open"; //$NON-NLS-1$ private AdapterFactory adapterFactory; @@ -108,10 +108,10 @@ public class OpenMenuContribution implements IContributionItemProvider { // Remove Open action in navigate menu which is not used in // Sirius and avoid to have a gray "Open" item menu in Navigate // menu - final IMenuManager navigateManager = (IMenuManager) menu.find("navigateMenu"); + final IMenuManager navigateManager = (IMenuManager) menu.find("navigateMenu"); //$NON-NLS-1$ // if the navigate menu is changed or deleted a NPE is avoided if (navigateManager != null) { - navigateManager.remove("open"); + navigateManager.remove("open"); //$NON-NLS-1$ } // Add menus to open existing representations final MenuManager openMenuManager = new MenuManager("Open", MENU_OPEN_REPRESENTATION_ID); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/PopupMenuContribution.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/PopupMenuContribution.java index 9e61b30441..1df9237955 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/PopupMenuContribution.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/PopupMenuContribution.java @@ -378,7 +378,7 @@ public class PopupMenuContribution implements IContributionItemProvider { IAction result = null; if (menuItemDescription instanceof ExternalJavaAction) { final ExternalJavaAction javaAction = (ExternalJavaAction) menuItemDescription; - if (javaAction.getId() != null && !"".equalsIgnoreCase(javaAction.getId())) { + if (javaAction.getId() != null && !"".equalsIgnoreCase(javaAction.getId())) { //$NON-NLS-1$ result = buildJavaAction(javaAction, selectedViews, domain, emfCommandFactory, interpreter, currentMouseLocation); } } else if (menuItemDescription instanceof OperationAction) { @@ -414,7 +414,7 @@ public class PopupMenuContribution implements IContributionItemProvider { final TransactionalEditingDomain transactionalEditingDomain = TransactionUtil.getEditingDomain(selectedViews.iterator().next()); final GMFCommandWrapper gefCommandWrapper = new GMFCommandWrapper(transactionalEditingDomain, command); if (command.canExecute()) { - if (javaActionMenuItem.getIcon() != null && !"".equals(javaActionMenuItem.getIcon())) { + if (javaActionMenuItem.getIcon() != null && !"".equals(javaActionMenuItem.getIcon())) { //$NON-NLS-1$ imageDescriptor = DiagramUIPlugin.Implementation.findImageDescriptor(javaActionMenuItem.getIcon()); } result = new Action(new IdentifiedElementQuery(javaActionMenuItem).getLabel(), imageDescriptor) { @@ -457,7 +457,7 @@ public class PopupMenuContribution implements IContributionItemProvider { }); cc.add(new ICommandProxy(new GMFCommandWrapper(transactionalEditingDomain, command))); ImageDescriptor imageDescriptor = null; - if (operationAction.getIcon() != null && !"".equals(operationAction.getIcon())) + if (operationAction.getIcon() != null && !"".equals(operationAction.getIcon())) //$NON-NLS-1$ imageDescriptor = DiagramUIPlugin.Implementation.findImageDescriptor(operationAction.getIcon()); return new Action(new IdentifiedElementQuery(operationAction).getLabel(), imageDescriptor) { public void run() { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/SubDiagramMenu.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/SubDiagramMenu.java index dd3ab4145d..0f3d7a8fbb 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/SubDiagramMenu.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/SubDiagramMenu.java @@ -49,9 +49,9 @@ import org.eclipse.ui.IWorkbenchPart; */ public class SubDiagramMenu implements IContributionItemProvider { - private static final String CREATE_REPRESENTATION_GROUP_SEPARATOR = "createRepresentationGroup"; + private static final String CREATE_REPRESENTATION_GROUP_SEPARATOR = "createRepresentationGroup"; //$NON-NLS-1$ - private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; + private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java index 41d7722eff..97e55af515 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteImageProvider.java @@ -42,7 +42,7 @@ import org.eclipse.swt.graphics.Image; */ public class PaletteImageProvider { - private static final String ICON_PATH = "iconPath"; + private static final String ICON_PATH = "iconPath"; //$NON-NLS-1$ /** * Returns the image descriptor from corresponding to the tool description diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteManagerImpl.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteManagerImpl.java index df4e52ed6a..c79a67a3d6 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteManagerImpl.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/PaletteManagerImpl.java @@ -225,7 +225,7 @@ public class PaletteManagerImpl implements PaletteManager { if (viewer != null) { paletteRoot = viewer.getPaletteRoot(); } else { - paletteRoot = (PaletteRoot) ReflectionHelper.getFieldValueWithoutException(editDomain, "paletteRoot").get(); + paletteRoot = (PaletteRoot) ReflectionHelper.getFieldValueWithoutException(editDomain, "paletteRoot").get(); //$NON-NLS-1$ } } @@ -394,7 +394,7 @@ public class PaletteManagerImpl implements PaletteManager { */ private void replaceNoteAttachmentCreationToolIfNeeded() { // Get the container of the Note Attachment Creation Tool - String notesContainerLabel = Platform.getResourceString(org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin.getInstance().getBundle(), "%NoteStack.Label"); + String notesContainerLabel = Platform.getResourceString(org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin.getInstance().getBundle(), "%NoteStack.Label"); //$NON-NLS-1$ PaletteContainer notesContainer = getPaletteContainer(paletteRoot, notesContainerLabel); if (notesContainer != null) { // Get the current noteAttachment tool @@ -416,7 +416,7 @@ public class PaletteManagerImpl implements PaletteManager { } private CreationToolEntry getNoteAttachementToolEntry(final PaletteContainer container) { - String noteAttachmentToolLabel = Platform.getResourceString(org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin.getInstance().getBundle(), "%NoteAttachmentTool.Label"); + String noteAttachmentToolLabel = Platform.getResourceString(org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin.getInstance().getBundle(), "%NoteAttachmentTool.Label"); //$NON-NLS-1$ for (Object child : container.getChildren()) { if (child instanceof CreationToolEntry) { CreationToolEntry paletteToolEntry = (CreationToolEntry) child; @@ -600,12 +600,12 @@ public class PaletteManagerImpl implements PaletteManager { private void addDefaultTools(final Diagram diagram) { final PaletteContainer container = paletteRoot.getDefaultEntry().getParent(); for (Object entry : container.getChildren()) { - if (entry instanceof PaletteSeparator && "defaultTools".equals(((PaletteSeparator) entry).getId())) { + if (entry instanceof PaletteSeparator && "defaultTools".equals(((PaletteSeparator) entry).getId())) { //$NON-NLS-1$ // Default tools are already there. Nothing to do. return; } } - final PaletteSeparator marker = new PaletteSeparator("defaultTools"); + final PaletteSeparator marker = new PaletteSeparator("defaultTools"); //$NON-NLS-1$ marker.setVisible(false); container.add(marker); for (final ToolEntry defaultEntry : PaletteManagerImpl.getDefaultTools(TransactionUtil.getEditingDomain(diagram).getResourceSet())) { @@ -632,7 +632,7 @@ public class PaletteManagerImpl implements PaletteManager { final PaletteContainer paletteDrawner = new SectionPaletteDrawer(name); paletteDrawner.setId(PaletteManagerImpl.getToolSectionId(section)); if (StringUtil.isEmpty(iconPath)) { - iconPath = "icons/obj16/ToolSection.gif"; + iconPath = "icons/obj16/ToolSection.gif"; //$NON-NLS-1$ } final ImageDescriptor descIcon = org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin.Implementation.findImageDescriptor(iconPath); if (descIcon != null) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/SiriusDiagramPaletteFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/SiriusDiagramPaletteFactory.java index a7977567fb..72176d29c8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/SiriusDiagramPaletteFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/palette/SiriusDiagramPaletteFactory.java @@ -54,15 +54,15 @@ public class SiriusDiagramPaletteFactory extends Adapter { if (noteAttachmentNotationType == null) { try { try { - Class<?> diagramNotationTypeClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.internal.util.DiagramNotationType"); + Class<?> diagramNotationTypeClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.internal.util.DiagramNotationType"); //$NON-NLS-1$ // We are in eclipse 3.3 - final Field searchField = diagramNotationTypeClass.getField("NOTE_ATTACHMENT"); + final Field searchField = diagramNotationTypeClass.getField("NOTE_ATTACHMENT"); //$NON-NLS-1$ noteAttachmentNotationType = (INotationType) searchField.get(null); } catch (final ClassNotFoundException cnfe) { // We are in eclipse 3.5 try { - Class<?> diagramNotationTypeClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType"); - final Field searchField = diagramNotationTypeClass.getField("NOTE_ATTACHMENT"); + Class<?> diagramNotationTypeClass = Class.forName("org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType"); //$NON-NLS-1$ + final Field searchField = diagramNotationTypeClass.getField("NOTE_ATTACHMENT"); //$NON-NLS-1$ noteAttachmentNotationType = (INotationType) searchField.get(null); } catch (final ClassNotFoundException cnfe2) { // Do nothing diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/part/SiriusDiagramGraphicalViewer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/part/SiriusDiagramGraphicalViewer.java index 58cc47b07b..82c941e6fd 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/part/SiriusDiagramGraphicalViewer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/part/SiriusDiagramGraphicalViewer.java @@ -144,8 +144,8 @@ public class SiriusDiagramGraphicalViewer extends DiagramGraphicalViewer impleme private final Field validatingField; public ToggleUpdateManager() { - invalidFiguresField = getAccessibleField("invalidFigures"); - validatingField = getAccessibleField("validating"); + invalidFiguresField = getAccessibleField("invalidFigures"); //$NON-NLS-1$ + validatingField = getAccessibleField("validating"); //$NON-NLS-1$ } private Field getAccessibleField(final String name) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/print/SiriusEnhancedPrintActionHelper.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/print/SiriusEnhancedPrintActionHelper.java index fd146c679c..621de50b8c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/print/SiriusEnhancedPrintActionHelper.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/print/SiriusEnhancedPrintActionHelper.java @@ -122,7 +122,7 @@ public class SiriusEnhancedPrintActionHelper implements IPrintActionHelper { Resource resource = diagram.eResource(); if (resource != null) { URI resourceURI = resource.getURI(); - diagramName = resourceURI.toString() + "#" + diagramName; + diagramName = resourceURI.toString() + "#" + diagramName; //$NON-NLS-1$ } diagramName = makeNameUnique(diagramName, diagramMap.keySet()); diagramMap.put(diagramName, diagram); @@ -164,7 +164,7 @@ public class SiriusEnhancedPrintActionHelper implements IPrintActionHelper { * @return A unique name. */ private String makeNameUnique(String name, Set<String> existingNames, int nbIteration) { - String result = name + " (" + nbIteration + ")"; + String result = name + " (" + nbIteration + ")"; //$NON-NLS-1$ //$NON-NLS-2$ if (existingNames.contains(result)) { result = makeNameUnique(name, existingNames, nbIteration + 1); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/DocumentationPropertySection.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/DocumentationPropertySection.java index 83a7f64879..68e95d8cd8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/DocumentationPropertySection.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/DocumentationPropertySection.java @@ -103,7 +103,7 @@ public class DocumentationPropertySection extends AbstractPropertySection { nameLabel = getWidgetFactory().createCLabel(composite, getLabelText(), SWT.TOP); nameLabel.setLayoutData(new GridData(SWT.NULL, SWT.TOP, false, true)); - CLabel help = getWidgetFactory().createCLabel(composite, ""); + CLabel help = getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$ help.setImage(getHelpIcon()); help.setLayoutData(new GridData(SWT.NULL, SWT.TOP, false, true)); help.setToolTipText(getToolTipText()); @@ -218,7 +218,7 @@ public class DocumentationPropertySection extends AbstractPropertySection { * @return The value of the default feature as text. */ protected String getDefaultFeatureAsText() { - String value = ""; + String value = ""; //$NON-NLS-1$ if (eObject != null && eObject.eGet(getFeature()) != null) { value = eObject.eGet(getFeature()).toString(); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/ExtendedPropertySource.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/ExtendedPropertySource.java index 8a4855da74..f17e0ffce1 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/ExtendedPropertySource.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/properties/ExtendedPropertySource.java @@ -378,7 +378,7 @@ public class ExtendedPropertySource implements IPropertySource { text = e.getMessage(); } } else if (element instanceof Collection) { - final StringBuffer sb = new StringBuffer("["); + final StringBuffer sb = new StringBuffer("["); //$NON-NLS-1$ boolean first = true; final Iterator<?> iterCollection = ((Collection<?>) element).iterator(); while (iterCollection.hasNext()) { @@ -386,7 +386,7 @@ public class ExtendedPropertySource implements IPropertySource { if (first) { first = false; } else { - sb.append(", "); + sb.append(", "); //$NON-NLS-1$ } if (next instanceof EObject) { sb.append(EMFCoreUtil.getQualifiedName((EObject) next, true)); @@ -396,10 +396,10 @@ public class ExtendedPropertySource implements IPropertySource { sb.append(String.valueOf(next)); } } - sb.append("]"); + sb.append("]"); //$NON-NLS-1$ text = sb.toString(); } else if (element == null) { - text = ""; + text = ""; //$NON-NLS-1$ } else if (element instanceof EEnumLiteral) { text = ((EEnumLiteral) element).getLiteral(); } else { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/DescribedDecoratorProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/DescribedDecoratorProvider.java index d8451dbb95..0996810479 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/DescribedDecoratorProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/DescribedDecoratorProvider.java @@ -31,7 +31,7 @@ public class DescribedDecoratorProvider extends AbstractProvider implements IDec /** * KEY for descriptors map. */ - public static final String KEY = "describedDecorator"; + public static final String KEY = "describedDecorator"; //$NON-NLS-1$ /** * diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecorator.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecorator.java index fc6c1a85ff..5a0d4ebf58 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecorator.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecorator.java @@ -127,7 +127,7 @@ public class EditModeDecorator extends AbstractSiriusDecorator { } else { // It means that the semantic element referenced by this edit part // is not editable, we return a "locked" image (red padlock) - return DiagramUIPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif")); + return DiagramUIPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif")); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecoratorProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecoratorProvider.java index 73f9770e39..cf8c925881 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecoratorProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/EditModeDecoratorProvider.java @@ -31,7 +31,7 @@ public class EditModeDecoratorProvider extends AbstractProvider implements IDeco /** * KEY for descriptors map. */ - public static final String KEY = "editModeDecorator"; + public static final String KEY = "editModeDecorator"; //$NON-NLS-1$ /** * diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/SubDiagramDecoratorProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/SubDiagramDecoratorProvider.java index bf5513353b..4b41e5f56d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/SubDiagramDecoratorProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/providers/decorators/SubDiagramDecoratorProvider.java @@ -46,7 +46,7 @@ import org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditor; */ public class SubDiagramDecoratorProvider extends AbstractProvider implements IDecoratorProvider { - private static final String KEY = "subDiagramStatus"; + private static final String KEY = "subDiagramStatus"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/NavigationMarkerConstants.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/NavigationMarkerConstants.java index 09aeae49d7..ad494bc4b3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/NavigationMarkerConstants.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/NavigationMarkerConstants.java @@ -23,14 +23,14 @@ public final class NavigationMarkerConstants { * The URI is like this : * platform:/resource/projectName/folderPath/fileName#id */ - public static final String DIAGRAM_URI = "DIAGRAM_URI"; + public static final String DIAGRAM_URI = "DIAGRAM_URI"; //$NON-NLS-1$ /** * The key for record the semantic element URI.<BR> * The URI is like this : * platform:/resource/projectName/folderPath/fileName#id */ - public static final String SEMANTIC_URI = "SEMANTIC_URI"; + public static final String SEMANTIC_URI = "SEMANTIC_URI"; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/ResourceMissingDocumentProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/ResourceMissingDocumentProvider.java index b44127613b..fe8104de14 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/ResourceMissingDocumentProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/resource/ResourceMissingDocumentProvider.java @@ -72,7 +72,7 @@ public class ResourceMissingDocumentProvider { if (errorDiagram == null) { errorResourceSet = new ResourceSetImpl(); final TransactionalEditingDomain domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(errorResourceSet); - errorResource = new GMFResourceFactory().createResource(URI.createURI("error://diagram")); + errorResource = new GMFResourceFactory().createResource(URI.createURI("error://diagram")); //$NON-NLS-1$ errorResourceSet.getResources().add(errorResource); errorDiagram = NotationFactory.eINSTANCE.createDiagram(); domain.getCommandStack().execute(new AddErrorCommand(domain, errorDiagram, errorResource, noteMessage)); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/DForestRouter.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/DForestRouter.java index a96a7d3451..8aad63cc6a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/DForestRouter.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/DForestRouter.java @@ -78,7 +78,7 @@ public class DForestRouter extends BendpointConnectionRouter implements Orthogon DTreeRouter connectionRouter = connections.get(connectionKey); if (connectionRouter == null) { DTreeRouter oldConnectionRouter = null; - if (!"base".equals(hint)) { + if (!"base".equals(hint)) { //$NON-NLS-1$ // Search only with hint (if the targetAnchor has been moved but // the target is the same) oldConnectionRouter = getSubRouterWithHint(hint); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideElementTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideElementTester.java index 6d849642ae..a6e4384b3b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideElementTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideElementTester.java @@ -36,7 +36,7 @@ public class CanHideElementTester extends PropertyTester { public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { boolean result = false; - if ("canHideElement".equals(property)) { + if ("canHideElement".equals(property)) { //$NON-NLS-1$ if (receiver instanceof IStructuredSelection) { result = testStructuredSelection((IStructuredSelection) receiver); } else if (receiver instanceof IDiagramElementEditPart) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideLabelTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideLabelTester.java index ca06af3224..98b072f817 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideLabelTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/CanHideLabelTester.java @@ -36,7 +36,7 @@ public class CanHideLabelTester extends PropertyTester { public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { boolean result = false; - if ("canHideLabel".equals(property)) { + if ("canHideLabel".equals(property)) { //$NON-NLS-1$ if (receiver instanceof IStructuredSelection) { result = testStructuredSelection((IStructuredSelection) receiver); } else if (receiver instanceof IDiagramElementEditPart) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementPropertyTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementPropertyTester.java index a7917fb406..97f01136af 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementPropertyTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementPropertyTester.java @@ -42,7 +42,7 @@ public class DModelElementPropertyTester extends PropertyTester { if (receiver instanceof IGraphicalEditPart) { final IGraphicalEditPart part = (IGraphicalEditPart) receiver; - if ("isDModelElement".equals(property)) { + if ("isDModelElement".equals(property)) { //$NON-NLS-1$ final EObject model = part.resolveSemanticElement(); result = model instanceof DDiagram || model instanceof DDiagramElement; if (!result && part.getParent() instanceof IGraphicalEditPart) { @@ -53,10 +53,10 @@ public class DModelElementPropertyTester extends PropertyTester { final EObject parentModel = ((IGraphicalEditPart) part.getParent()).resolveSemanticElement(); result = parentModel instanceof DDiagram || parentModel instanceof DDiagramElement; } - } else if ("isDDiagram".equals(property)) { + } else if ("isDDiagram".equals(property)) { //$NON-NLS-1$ final EObject model = part.resolveSemanticElement(); result = model instanceof DDiagram; - } else if ("isDDiagramElement".equals(property)) { + } else if ("isDDiagramElement".equals(property)) { //$NON-NLS-1$ final EObject model = part.resolveSemanticElement(); result = model instanceof DDiagramElement; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementWithLabelPropertyTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementWithLabelPropertyTester.java index 29e57fa866..99020310e3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementWithLabelPropertyTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/DModelElementWithLabelPropertyTester.java @@ -42,7 +42,7 @@ public class DModelElementWithLabelPropertyTester extends PropertyTester { if (receiver instanceof IGraphicalEditPart) { final IGraphicalEditPart part = (IGraphicalEditPart) receiver; - if ("isDModelElementWithLabel".equals(property)) { + if ("isDModelElementWithLabel".equals(property)) { //$NON-NLS-1$ final EObject model = part.resolveSemanticElement(); if (model instanceof DDiagramElement) { result = new DDiagramElementQuery((DDiagramElement) model).canHideLabel(); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenElementsTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenElementsTester.java index 66cc76b92f..cd9370a436 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenElementsTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenElementsTester.java @@ -32,7 +32,7 @@ public class HiddenElementsTester extends PropertyTester { public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) { boolean result = false; - if ("diagramHasHiddenElements".equals(property) && receiver instanceof IStructuredSelection) { + if ("diagramHasHiddenElements".equals(property) && receiver instanceof IStructuredSelection) { //$NON-NLS-1$ final Iterator<?> iterator = ((IStructuredSelection) receiver).iterator(); while (iterator.hasNext()) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenLabelTester.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenLabelTester.java index 41ad93c4d0..1427d46289 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenLabelTester.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/testers/HiddenLabelTester.java @@ -35,7 +35,7 @@ public class HiddenLabelTester extends PropertyTester { public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { boolean result = false; - if ("isLabelHidden".equals(property)) { + if ("isLabelHidden".equals(property)) { //$NON-NLS-1$ if (receiver instanceof IStructuredSelection) { result = testStructuredSelection((IStructuredSelection) receiver); } else if (receiver instanceof IDiagramElementEditPart) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/GMFRuntimeCompatibility.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/GMFRuntimeCompatibility.java index eeeab19c3a..226f881bc7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/GMFRuntimeCompatibility.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/GMFRuntimeCompatibility.java @@ -34,7 +34,7 @@ public final class GMFRuntimeCompatibility { Version gmfVersion1_2_0 = new Version(1, 2, 0); Version gmfVersion1_3_3 = new Version(1, 3, 3); Version version = null; - String stringVersion = Platform.getBundle("org.eclipse.gmf.runtime.diagram.ui").getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); + String stringVersion = Platform.getBundle("org.eclipse.gmf.runtime.diagram.ui").getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); //$NON-NLS-1$ try { version = Version.parseVersion(stringVersion); if (compareTo(gmfVersion1_2_0, version) <= 0 && compareTo(gmfVersion1_3_3, version) >= 0) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java index b700363c3d..429f2baec6 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/ui/SnapToAllDragEditPartsTracker.java @@ -29,7 +29,7 @@ public class SnapToAllDragEditPartsTracker extends DragEditPartsTrackerEx { * Constant passed to extended data of the request to keep the chosen mode * (with KEY {@link #SNAP_TO_ALL}. */ - public static final String SNAP_TO_ALL_SHAPE_KEY = "snapToAllShape"; + public static final String SNAP_TO_ALL_SHAPE_KEY = "snapToAllShape"; //$NON-NLS-1$ /** * The default mode for {@link #snapToAllShape}. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/GMFNotationUtilities.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/GMFNotationUtilities.java index 8eb313018c..934a7fb834 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/GMFNotationUtilities.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/util/GMFNotationUtilities.java @@ -180,7 +180,7 @@ public final class GMFNotationUtilities { * @return the string terminal used in {@link IdentityAnchor} */ public static String getTerminalString(double xPercentage, double yPercentage) { - return "(" + String.valueOf(xPercentage) + "," + String.valueOf(yPercentage) + ")"; + return "(" + String.valueOf(xPercentage) + "," + String.valueOf(yPercentage) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/outlineview/DiagramOutlineWithBookPages.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/outlineview/DiagramOutlineWithBookPages.java index cd4a0c1d85..2f05c6fd6b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/outlineview/DiagramOutlineWithBookPages.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/outlineview/DiagramOutlineWithBookPages.java @@ -50,10 +50,10 @@ public class DiagramOutlineWithBookPages extends DiagramOutlinePage { private static final String FILTER_TIP_TEXT = "Filters"; /** The layers icon descriptor. */ - private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); + private static final ImageDescriptor DESC_LAYER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/layers.gif"); //$NON-NLS-1$ /** The filters icon descriptor. */ - private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); + private static final ImageDescriptor DESC_FILTER = DiagramUIPlugin.Implementation.getBundledImageDescriptor("icons/filters.gif"); //$NON-NLS-1$ /** The show layers action */ private IAction showLayersAction; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/filters/FiltersTableViewer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/filters/FiltersTableViewer.java index 5060206b33..d6f4b97d07 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/filters/FiltersTableViewer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/filters/FiltersTableViewer.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.TableColumn; */ public final class FiltersTableViewer { - private static final String[] COLUMNS = { " ", "Filter" }; + private static final String[] COLUMNS = { " ", "Filter" }; //$NON-NLS-1$ /** * Avoid instantiation. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/layers/LayersTableViewer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/layers/LayersTableViewer.java index cfe865065d..2111b43eb1 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/layers/LayersTableViewer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/views/providers/layers/LayersTableViewer.java @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.TableColumn; */ public final class LayersTableViewer { - private static final String[] COLUMNS = { " ", " ", "Layer" }; + private static final String[] COLUMNS = { " ", " ", "Layer" }; //$NON-NLS-1$ /** * Avoid instantiation. diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java index 38943c3d8f..67a2f7d9ba 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernDescriptionItemProvider.java @@ -156,7 +156,7 @@ public class ConcernDescriptionItemProvider extends DocumentedElementItemProvide @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ConcernDescription) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_ConcernDescription_type") : label; + return label == null || label.length() == 0 ? getString("_UI_ConcernDescription_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java index 7ea736b605..3817d09378 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/concern/provider/ConcernSetItemProvider.java @@ -112,7 +112,7 @@ public class ConcernSetItemProvider extends DocumentedElementItemProvider { @Override public String getText(Object object) { String label = ((ConcernSet) object).getDocumentation(); - return label == null || label.length() == 0 ? getString("_UI_ConcernSet_type") : label; + return label == null || label.length() == 0 ? getString("_UI_ConcernSet_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java index dac0b236da..5ead96c48b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/CompositeFilterDescriptionItemProvider.java @@ -113,7 +113,7 @@ public class CompositeFilterDescriptionItemProvider extends FilterDescriptionIte if (label != null) { return label; } - return getString("_UI_CompositeFilterDescription_type"); + return getString("_UI_CompositeFilterDescription_type"); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java index 38ce8fdee6..ab0bf75741 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/filter/provider/FilterDescriptionItemProvider.java @@ -103,7 +103,7 @@ public class FilterDescriptionItemProvider extends DocumentedElementItemProvider if (label != null) { return label; } - return getString("_UI_FilterDescription_type"); + return getString("_UI_FilterDescription_type"); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java index d30c335195..7ca73893c9 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AbstractNodeMappingItemProvider.java @@ -152,7 +152,7 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr @Override public String getText(Object object) { String label = new IdentifiedElementQuery((AbstractNodeMapping) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_AbstractNodeMapping_type") : getString("_UI_AbstractNodeMapping_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_AbstractNodeMapping_type") : getString("_UI_AbstractNodeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** @@ -191,7 +191,7 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr super.collectNewChildDescriptors(newChildDescriptors, object); NodeMapping createNodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - createNodeMapping.setSemanticCandidatesExpression("feature:eAllContents"); + createNodeMapping.setSemanticCandidatesExpression("feature:eAllContents"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS, createNodeMapping)); newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS, @@ -213,7 +213,7 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr boolean qualify = childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); } @@ -229,11 +229,11 @@ public class AbstractNodeMappingItemProvider extends DiagramElementMappingItemPr String featureKey; if (feature instanceof EStructuralFeature) { EStructuralFeature eFeature = (EStructuralFeature) feature; - featureKey = eFeature.getEContainingClass().getName() + "_" + eFeature.getName(); + featureKey = eFeature.getEContainingClass().getName() + "_" + eFeature.getName(); //$NON-NLS-1$ } else { featureKey = "Unknown"; } - return getResourceLocator().getString("_UI_" + featureKey + "_feature_prefix"); + return getResourceLocator().getString("_UI_" + featureKey + "_feature_prefix"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java index d6adb651c0..aa5ae5cc7a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java @@ -105,7 +105,7 @@ public class AdditionalLayerItemProvider extends LayerItemProvider { return optionImageURL.get(); } } - return overlayImage(object, getResourceLocator().getImage("full/obj16/AdditionalLayer")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/AdditionalLayer")); //$NON-NLS-1$ } /** @@ -117,7 +117,7 @@ public class AdditionalLayerItemProvider extends LayerItemProvider { @Override public String getText(Object object) { String label = new IdentifiedElementQuery((AdditionalLayer) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_AdditionalLayer_type") : label; + return label == null || label.length() == 0 ? getString("_UI_AdditionalLayer_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java index b1a9278439..69ec9ac13e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalContainerStyleDescriptionItemProvider.java @@ -152,11 +152,11 @@ public class ConditionalContainerStyleDescriptionItemProvider extends Conditiona super.collectNewChildDescriptors(newChildDescriptors, object); FlatContainerStyleDescription flatContainerStyleDescription = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); - flatContainerStyleDescription.setBorderSizeComputationExpression("1"); + flatContainerStyleDescription.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_CONTAINER_STYLE_DESCRIPTION__STYLE, flatContainerStyleDescription)); ShapeContainerStyleDescription shapeContainerStyleDescription = StyleFactory.eINSTANCE.createShapeContainerStyleDescription(); - shapeContainerStyleDescription.setBorderSizeComputationExpression("1"); + shapeContainerStyleDescription.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_CONTAINER_STYLE_DESCRIPTION__STYLE, shapeContainerStyleDescription)); newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_CONTAINER_STYLE_DESCRIPTION__STYLE, StyleFactory.eINSTANCE.createWorkspaceImageDescription())); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java index 8e1f9fcd2a..94e37b6d17 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalEdgeStyleDescriptionItemProvider.java @@ -151,12 +151,12 @@ public class ConditionalEdgeStyleDescriptionItemProvider extends ConditionalStyl super.collectNewChildDescriptors(newChildDescriptors, object); EdgeStyleDescription esd = StyleFactory.eINSTANCE.createEdgeStyleDescription(); - esd.setSizeComputationExpression("2"); + esd.setSizeComputationExpression("2"); //$NON-NLS-1$ esd.setCenterLabelStyleDescription(StyleFactory.eINSTANCE.createCenterLabelStyleDescription()); newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_EDGE_STYLE_DESCRIPTION__STYLE, esd)); BracketEdgeStyleDescription bsd = StyleFactory.eINSTANCE.createBracketEdgeStyleDescription(); - bsd.setSizeComputationExpression("2"); + bsd.setSizeComputationExpression("2"); //$NON-NLS-1$ bsd.setCenterLabelStyleDescription(StyleFactory.eINSTANCE.createCenterLabelStyleDescription()); newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_EDGE_STYLE_DESCRIPTION__STYLE, bsd)); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java index b09efa1702..ceb1d86d18 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ConditionalNodeStyleDescriptionItemProvider.java @@ -169,7 +169,7 @@ public class ConditionalNodeStyleDescriptionItemProvider extends ConditionalStyl newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_NODE_STYLE_DESCRIPTION__STYLE, StyleFactory.eINSTANCE.createGaugeCompositeStyleDescription())); WorkspaceImageDescription wkpImageDescription = StyleFactory.eINSTANCE.createWorkspaceImageDescription(); - wkpImageDescription.setSizeComputationExpression("-1"); + wkpImageDescription.setSizeComputationExpression("-1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.CONDITIONAL_NODE_STYLE_DESCRIPTION__STYLE, wkpImageDescription)); // Set by default all elements resizable and their label position on diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java index 2da3863d31..c8414e8937 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingImportItemProvider.java @@ -124,7 +124,7 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ContainerMappingImport) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_ContainerMappingImport_type") : label; + return label == null || label.length() == 0 ? getString("_UI_ContainerMappingImport_type") : label; //$NON-NLS-1$ } /** @@ -176,7 +176,7 @@ public class ContainerMappingImportItemProvider extends ContainerMappingItemProv || childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java index ca0be7fbfa..6d104b220e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/ContainerMappingItemProvider.java @@ -214,7 +214,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ContainerMapping) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_ContainerMapping_type") : label; + return label == null || label.length() == 0 ? getString("_UI_ContainerMapping_type") : label; //$NON-NLS-1$ } /** @@ -261,25 +261,25 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide super.collectNewChildDescriptors(newChildDescriptors, object); NodeMapping createNodeMapping = DescriptionFactory.eINSTANCE.createNodeMapping(); - createNodeMapping.setSemanticCandidatesExpression("feature:eAllContents"); + createNodeMapping.setSemanticCandidatesExpression("feature:eAllContents"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS, createNodeMapping)); newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS, DescriptionFactory.eINSTANCE.createNodeMappingImport())); ContainerMapping createContainerMapping = DescriptionFactory.eINSTANCE.createContainerMapping(); - createContainerMapping.setSemanticCandidatesExpression("feature:eAllContents"); + createContainerMapping.setSemanticCandidatesExpression("feature:eAllContents"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS, createContainerMapping)); newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_CONTAINER_MAPPINGS, DescriptionFactory.eINSTANCE.createContainerMappingImport())); FlatContainerStyleDescription flatContainerStyleDescription = StyleFactory.eINSTANCE.createFlatContainerStyleDescription(); - flatContainerStyleDescription.setBorderSizeComputationExpression("1"); + flatContainerStyleDescription.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE, flatContainerStyleDescription)); ShapeContainerStyleDescription shapeContainerStyleDescription = StyleFactory.eINSTANCE.createShapeContainerStyleDescription(); - shapeContainerStyleDescription.setBorderSizeComputationExpression("1"); + shapeContainerStyleDescription.setBorderSizeComputationExpression("1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE, shapeContainerStyleDescription)); newChildDescriptors.add(createChildParameter(org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__STYLE, @@ -305,7 +305,7 @@ public class ContainerMappingItemProvider extends AbstractNodeMappingItemProvide || childFeature == org.eclipse.sirius.diagram.description.DescriptionPackage.Literals.CONTAINER_MAPPING__SUB_NODE_MAPPINGS; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeaturePrefixText(childFeature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java index 21bcf5bd1c..709538acf7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramDescriptionItemProvider.java @@ -482,7 +482,7 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DiagramDescription) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_DiagramDescription_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DiagramDescription_type") : label; //$NON-NLS-1$ } /** @@ -668,7 +668,7 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription // this case we could also put only the Feature text as the only // child type currently available for is Layer (see // collectNewChildDescriptors). - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), "Default", getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), "Default", getTypeText(owner) }); //$NON-NLS-1$ } String createChildText = super.getCreateChildText(owner, feature, child, selection); if (child != null && isNormalEdgeMapping(child)) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java index ab7cb92eff..e7c7724528 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramElementMappingItemProvider.java @@ -183,7 +183,7 @@ public class DiagramElementMappingItemProvider extends RepresentationElementMapp @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DiagramElementMapping) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DiagramElementMapping_type") : getString("_UI_DiagramElementMapping_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DiagramElementMapping_type") : getString("_UI_DiagramElementMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java index e94f47a1de..6e4e818904 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/DiagramImportDescriptionItemProvider.java @@ -501,7 +501,7 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DiagramImportDescription) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_DiagramImportDescription_type") : getString("_UI_DiagramImportDescription_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_DiagramImportDescription_type") : getString("_UI_DiagramImportDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** @@ -685,7 +685,7 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP // this case we could also put only the Feature text as the only // child type currently available for is Layer (see // collectNewChildDescriptors). - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), "Default", getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), "Default", getTypeText(owner) }); //$NON-NLS-1$ } String createChildText = super.getCreateChildText(owner, feature, child, selection); if (child != null && isNormalEdgeMapping(child)) { diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java index e253fc2c1b..41a2efe753 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingImportItemProvider.java @@ -178,7 +178,7 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider @Override public String getText(Object object) { String label = new IdentifiedElementQuery((EdgeMappingImport) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_EdgeMappingImport_type") : label; + return label == null || label.length() == 0 ? getString("_UI_EdgeMappingImport_type") : label; //$NON-NLS-1$ } /** @@ -189,7 +189,7 @@ public class EdgeMappingImportItemProvider extends DocumentedElementItemProvider */ public String getTextGen(Object object) { String label = new IdentifiedElementQuery((EdgeMappingImport) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_EdgeMappingImport_type") : getString("_UI_EdgeMappingImport_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_EdgeMappingImport_type") : getString("_UI_EdgeMappingImport_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java index 65ac0ed71a..d2c565adf8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/EdgeMappingItemProvider.java @@ -299,7 +299,7 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider { label = "Relation Based Edge"; } } - return label == null || label.length() == 0 ? getString("_UI_EdgeMapping_type") : label; + return label == null || label.length() == 0 ? getString("_UI_EdgeMapping_type") : label; //$NON-NLS-1$ } /** @@ -394,7 +394,7 @@ public class EdgeMappingItemProvider extends DiagramElementMappingItemProvider { * the edge style. */ private void edgeStyleInit(EdgeStyleDescription edgeStyle) { - edgeStyle.setSizeComputationExpression("2"); + edgeStyle.setSizeComputationExpression("2"); //$NON-NLS-1$ edgeStyle.setCenterLabelStyleDescription(StyleFactory.eINSTANCE.createCenterLabelStyleDescription()); } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java index 8a3b12fc1e..bcd649e049 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/LayerItemProvider.java @@ -245,7 +245,7 @@ public class LayerItemProvider extends DocumentedElementItemProvider { } } - return overlayImage(object, getResourceLocator().getImage("full/obj16/Layer")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/Layer")); //$NON-NLS-1$ } /** @@ -257,7 +257,7 @@ public class LayerItemProvider extends DocumentedElementItemProvider { @Override public String getText(Object object) { String label = new IdentifiedElementQuery((Layer) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_Layer_type") : label; + return label == null || label.length() == 0 ? getString("_UI_Layer_type") : label; //$NON-NLS-1$ } /** @@ -316,11 +316,11 @@ public class LayerItemProvider extends DocumentedElementItemProvider { EdgeStyleDescription edgeDomainStyle = StyleFactory.eINSTANCE.createEdgeStyleDescription(); // Add the center label style to edge style description - edgeStyle.setSizeComputationExpression("2"); + edgeStyle.setSizeComputationExpression("2"); //$NON-NLS-1$ edgeStyle.setCenterLabelStyleDescription(StyleFactory.eINSTANCE.createCenterLabelStyleDescription()); // Add the center label style to edge style description for edge with // domain element - edgeDomainStyle.setSizeComputationExpression("2"); + edgeDomainStyle.setSizeComputationExpression("2"); //$NON-NLS-1$ edgeDomainStyle.setCenterLabelStyleDescription(StyleFactory.eINSTANCE.createCenterLabelStyleDescription()); // Add the edge style description to edge mapping diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java index 9f6b0e764a..886a9b3590 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingImportItemProvider.java @@ -116,9 +116,9 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider { public Object getImage(Object object) { EStructuralFeature eContainingFeature = ((EObject) object).eContainingFeature(); if (eContainingFeature != null && eContainingFeature.getFeatureID() == org.eclipse.sirius.diagram.description.DescriptionPackage.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS) { - return overlayImage(object, getResourceLocator().getImage("obj16/BorderedNodeMappingImport")); + return overlayImage(object, getResourceLocator().getImage("obj16/BorderedNodeMappingImport")); //$NON-NLS-1$ } - return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeMappingImport")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeMappingImport")); //$NON-NLS-1$ } /** @@ -134,7 +134,7 @@ public class NodeMappingImportItemProvider extends NodeMappingItemProvider { if (eContainingFeature != null && eContainingFeature.getFeatureID() == org.eclipse.sirius.diagram.description.DescriptionPackage.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS) { return "Bordered " + label; } - return label == null || label.length() == 0 ? getString("_UI_NodeMappingImport_type") : label; + return label == null || label.length() == 0 ? getString("_UI_NodeMappingImport_type") : label; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java index eb499ad968..8ab5af7e66 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/NodeMappingItemProvider.java @@ -124,9 +124,9 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider { public Object getImage(Object object) { EStructuralFeature eContainingFeature = ((EObject) object).eContainingFeature(); if (eContainingFeature != null && eContainingFeature.getFeatureID() == org.eclipse.sirius.diagram.description.DescriptionPackage.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS) { - return overlayImage(object, getResourceLocator().getImage("obj16/BorderedNodeMapping")); + return overlayImage(object, getResourceLocator().getImage("obj16/BorderedNodeMapping")); //$NON-NLS-1$ } - return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeMapping")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeMapping")); //$NON-NLS-1$ } /** @@ -142,7 +142,7 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider { if (eContainingFeature != null && eContainingFeature.getFeatureID() == org.eclipse.sirius.diagram.description.DescriptionPackage.ABSTRACT_NODE_MAPPING__BORDERED_NODE_MAPPINGS) { return "Bordered " + label; } - return label == null || label.length() == 0 ? getString("_UI_NodeMapping_type") : label; + return label == null || label.length() == 0 ? getString("_UI_NodeMapping_type") : label; //$NON-NLS-1$ } /** @@ -206,7 +206,7 @@ public class NodeMappingItemProvider extends AbstractNodeMappingItemProvider { newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, StyleFactory.eINSTANCE.createGaugeCompositeStyleDescription())); WorkspaceImageDescription wkpImageDescription = StyleFactory.eINSTANCE.createWorkspaceImageDescription(); - wkpImageDescription.setSizeComputationExpression("-1"); + wkpImageDescription.setSizeComputationExpression("-1"); //$NON-NLS-1$ newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__STYLE, wkpImageDescription)); newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.NODE_MAPPING__CONDITIONNAL_STYLES, DescriptionFactory.eINSTANCE.createConditionalNodeStyleDescription())); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java index cc0f8bb074..4c4eb87969 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BorderedStyleDescriptionItemProvider.java @@ -194,7 +194,7 @@ IItemPropertySource { boolean qualify = feature == StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java index 81563522a1..32ecc43a52 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/BundledImageDescriptionItemProvider.java @@ -109,10 +109,10 @@ public class BundledImageDescriptionItemProvider extends NodeStyleDescriptionIte String color = new ColorQuery(((BundledImageDescription) object).getColor()).getLabel(); String shape = ((BundledImageDescription) object).getShape().getName(); - String label = getString("_UI_BundledImageDescription_type"); + String label = getString("_UI_BundledImageDescription_type"); //$NON-NLS-1$ if (shape != null && color != null) { - return label + " " + color + " " + shape; + return label + " " + color + " " + shape; //$NON-NLS-1$ //$NON-NLS-2$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java index da653c45c0..fa827db8b2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ContainerStyleDescriptionItemProvider.java @@ -340,7 +340,7 @@ public class ContainerStyleDescriptionItemProvider extends RoundedCornerStyleDes boolean qualify = feature == org.eclipse.sirius.diagram.description.style.StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java index 8d79863255..408fcca1b9 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/DotDescriptionItemProvider.java @@ -108,10 +108,10 @@ public class DotDescriptionItemProvider extends NodeStyleDescriptionItemProvider public String getText(Object object) { String color = new ColorQuery(((DotDescription) object).getBackgroundColor()).getLabel(); - String label = getString("_UI_DotDescription_type"); + String label = getString("_UI_DotDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java index d2d1454402..428dd984d8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/EllipseNodeDescriptionItemProvider.java @@ -121,10 +121,10 @@ public class EllipseNodeDescriptionItemProvider extends NodeStyleDescriptionItem public String getText(Object object) { String color = new ColorQuery(((EllipseNodeDescription) object).getColor()).getLabel(); - String label = getString("_UI_EllipseNodeDescription_type"); + String label = getString("_UI_EllipseNodeDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java index 9ba585107f..fd85fe007d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/FlatContainerStyleDescriptionItemProvider.java @@ -180,7 +180,7 @@ public class FlatContainerStyleDescriptionItemProvider extends ContainerStyleDes String bgColor = new ColorQuery(((FlatContainerStyleDescription) object).getBackgroundColor()).getLabel(); String fgColor = new ColorQuery(((FlatContainerStyleDescription) object).getForegroundColor()).getLabel(); - String label = getString("_UI_FlatContainerStyleDescription_type"); + String label = getString("_UI_FlatContainerStyleDescription_type"); //$NON-NLS-1$ if (fgColor != null & bgColor != null) { return label + " " + bgColor + " to " + fgColor; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java index 3f8d4e7ee2..69a50f1c12 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeCompositeStyleDescriptionItemProvider.java @@ -125,7 +125,7 @@ public class GaugeCompositeStyleDescriptionItemProvider extends NodeStyleDescrip */ @Override public String getText(Object object) { - return getString("_UI_GaugeCompositeStyleDescription_type"); + return getString("_UI_GaugeCompositeStyleDescription_type"); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java index ca477d135f..eec299fc7e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/GaugeSectionDescriptionItemProvider.java @@ -174,7 +174,7 @@ IItemPropertySource { String bgColor = new ColorQuery(((GaugeSectionDescription) object).getBackgroundColor()).getLabel(); String fgColor = new ColorQuery(((GaugeSectionDescription) object).getForegroundColor()).getLabel(); - String label = getString("_UI_GaugeSectionDescription_type"); + String label = getString("_UI_GaugeSectionDescription_type"); //$NON-NLS-1$ if (fgColor != null & bgColor != null) { return label + " " + bgColor + " to " + fgColor; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java index 56760618ce..4e6343f57c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/LozengeNodeDescriptionItemProvider.java @@ -120,10 +120,10 @@ public class LozengeNodeDescriptionItemProvider extends NodeStyleDescriptionItem @Override public String getText(Object object) { String color = new ColorQuery(((LozengeNodeDescription) object).getColor()).getLabel(); - String label = getString("_UI_LozengeNodeDescription_type"); + String label = getString("_UI_LozengeNodeDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java index 67393372ac..a07262baed 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NodeStyleDescriptionItemProvider.java @@ -318,7 +318,7 @@ IItemPropertySource { */ @Override public String getText(Object object) { - String label = getString("_UI_NodeStyleDescription_type"); + String label = getString("_UI_NodeStyleDescription_type"); //$NON-NLS-1$ return label; } @@ -390,7 +390,7 @@ IItemPropertySource { boolean qualify = feature == org.eclipse.sirius.diagram.description.style.StylePackage.Literals.BORDERED_STYLE_DESCRIPTION__BORDER_COLOR; if (qualify) { - return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); + return getString("_UI_CreateChild_text2", new Object[] { getTypeText(child), getFeatureText(feature), getTypeText(owner) }); //$NON-NLS-1$ } return super.getCreateChildText(owner, feature, child, selection); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java index 223ea5b9ee..0a0b49bfbf 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/NoteDescriptionItemProvider.java @@ -92,10 +92,10 @@ public class NoteDescriptionItemProvider extends NodeStyleDescriptionItemProvide public String getText(Object object) { String color = new ColorQuery(((NoteDescription) object).getColor()).getLabel(); - String label = getString("_UI_NoteDescription_type"); + String label = getString("_UI_NoteDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java index 37763b6103..3a84432ae8 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/ShapeContainerStyleDescriptionItemProvider.java @@ -148,10 +148,10 @@ public class ShapeContainerStyleDescriptionItemProvider extends ContainerStyleDe public String getText(Object object) { String color = new ColorQuery(((ShapeContainerStyleDescription) object).getBackgroundColor()).getLabel(); - String label = getString("_UI_ShapeContainerStyleDescription_type"); + String label = getString("_UI_ShapeContainerStyleDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java index 98b10bef4a..287a0c1ec9 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/style/provider/SquareDescriptionItemProvider.java @@ -123,10 +123,10 @@ public class SquareDescriptionItemProvider extends NodeStyleDescriptionItemProvi public String getText(Object object) { String color = new ColorQuery(((SquareDescription) object).getColor()).getLabel(); - String label = getString("_UI_SquareDescription_type"); + String label = getString("_UI_SquareDescription_type"); //$NON-NLS-1$ if (color != null) { - return label + " " + color; + return label + " " + color; //$NON-NLS-1$ } else { return label; } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java index 0d706a1f90..20685b21be 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/BehaviorToolItemProvider.java @@ -131,7 +131,7 @@ public class BehaviorToolItemProvider extends AbstractToolDescriptionItemProvide @Override public String getText(Object object) { String label = new IdentifiedElementQuery((BehaviorTool) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_BehaviorTool_type") : getString("_UI_BehaviorTool_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_BehaviorTool_type") : getString("_UI_BehaviorTool_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java index a85f6c9f87..1a12776b18 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerCreationDescriptionItemProvider.java @@ -163,7 +163,7 @@ public class ContainerCreationDescriptionItemProvider extends MappingBasedToolDe @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ContainerCreationDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_ContainerCreationDescription_type") : getString("_UI_ContainerCreationDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_ContainerCreationDescription_type") : getString("_UI_ContainerCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java index 2cdbf2cbda..08207fcb05 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ContainerDropDescriptionItemProvider.java @@ -165,7 +165,7 @@ public class ContainerDropDescriptionItemProvider extends MappingBasedToolDescri @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ContainerDropDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_ContainerDropDescription_type") : getString("_UI_ContainerDropDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_ContainerDropDescription_type") : getString("_UI_ContainerDropDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java index 6b4c8d11c3..0b01b34e45 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DeleteElementDescriptionItemProvider.java @@ -118,7 +118,7 @@ public class DeleteElementDescriptionItemProvider extends MappingBasedToolDescri @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DeleteElementDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DeleteElementDescription_type") : getString("_UI_DeleteElementDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DeleteElementDescription_type") : getString("_UI_DeleteElementDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java index eeea88019f..dae7b949e5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramCreationDescriptionItemProvider.java @@ -94,7 +94,7 @@ public class DiagramCreationDescriptionItemProvider extends RepresentationCreati @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DiagramCreationDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DiagramCreationDescription_type") : getString("_UI_DiagramCreationDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DiagramCreationDescription_type") : getString("_UI_DiagramCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java index bf5f20b6d5..c39b3d16a5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DiagramNavigationDescriptionItemProvider.java @@ -94,7 +94,7 @@ public class DiagramNavigationDescriptionItemProvider extends RepresentationNavi @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DiagramNavigationDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DiagramNavigationDescription_type") : getString("_UI_DiagramNavigationDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DiagramNavigationDescription_type") : getString("_UI_DiagramNavigationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java index 95edf53ee3..70dce18ded 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DirectEditLabelItemProvider.java @@ -131,7 +131,7 @@ public class DirectEditLabelItemProvider extends MappingBasedToolDescriptionItem @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DirectEditLabel) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DirectEditLabel_type") : getString("_UI_DirectEditLabel_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DirectEditLabel_type") : getString("_UI_DirectEditLabel_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java index 682788fb2a..0dad08a5a3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/DoubleClickDescriptionItemProvider.java @@ -131,7 +131,7 @@ public class DoubleClickDescriptionItemProvider extends MappingBasedToolDescript @Override public String getText(Object object) { String label = new IdentifiedElementQuery((DoubleClickDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_DoubleClickDescription_type") : getString("_UI_DoubleClickDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_DoubleClickDescription_type") : getString("_UI_DoubleClickDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java index a86ec34b34..4cf38708ee 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/EdgeCreationDescriptionItemProvider.java @@ -149,10 +149,10 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip @Override protected void addPreconditionPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_EdgeCreationDescription_precondition_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"), + getString("_UI_EdgeCreationDescription_precondition_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_AbstractToolDescription_precondition_feature", "_UI_AbstractToolDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ org.eclipse.sirius.viewpoint.description.tool.ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - getString("_UI_GeneralPropertyCategory"), null)); + getString("_UI_GeneralPropertyCategory"), null)); //$NON-NLS-1$ } /** @@ -212,7 +212,7 @@ public class EdgeCreationDescriptionItemProvider extends MappingBasedToolDescrip @Override public String getText(Object object) { String label = new IdentifiedElementQuery((EdgeCreationDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_EdgeCreationDescription_type") : getString("_UI_EdgeCreationDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_EdgeCreationDescription_type") : getString("_UI_EdgeCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java index cff7422aa5..119f0a1561 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NavigationItemProvider.java @@ -111,9 +111,9 @@ public class NavigationItemProvider extends ContainerModelOperationItemProvider public String getText(Object object) { Navigation navigation = (Navigation) object; if (navigation.getDiagramDescription() != null && navigation.getDiagramDescription().getName() != null) { - return getString("_UI_Navigation_type") + " to " + navigation.getDiagramDescription().getName(); + return getString("_UI_Navigation_type") + " to " + navigation.getDiagramDescription().getName(); //$NON-NLS-1$ } else { - return getString("_UI_Navigation_type") + " " + navigation.isCreateIfNotExistent(); + return getString("_UI_Navigation_type") + " " + navigation.isCreateIfNotExistent(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java index 627ca3f6a0..bd4e10140a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/NodeCreationDescriptionItemProvider.java @@ -163,7 +163,7 @@ public class NodeCreationDescriptionItemProvider extends MappingBasedToolDescrip @Override public String getText(Object object) { String label = new IdentifiedElementQuery((NodeCreationDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_NodeCreationDescription_type") : getString("_UI_NodeCreationDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_NodeCreationDescription_type") : getString("_UI_NodeCreationDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java index a7aa525345..7ff7ae7274 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ReconnectEdgeDescriptionItemProvider.java @@ -137,7 +137,7 @@ public class ReconnectEdgeDescriptionItemProvider extends MappingBasedToolDescri @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ReconnectEdgeDescription) object).getLabel(); - return StringUtil.isEmpty(label) ? getString("_UI_ReconnectEdgeDescription_type") : getString("_UI_ReconnectEdgeDescription_type") + " " + label; + return StringUtil.isEmpty(label) ? getString("_UI_ReconnectEdgeDescription_type") : getString("_UI_ReconnectEdgeDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java index eba10fa781..f90015df7b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/RequestDescriptionItemProvider.java @@ -95,7 +95,7 @@ public class RequestDescriptionItemProvider extends AbstractToolDescriptionItemP @Override public String getText(Object object) { String label = new IdentifiedElementQuery((RequestDescription) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_RequestDescription_type") : getString("_UI_RequestDescription_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_RequestDescription_type") : getString("_UI_RequestDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java index 0667c5afa5..bbcc5cb541 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolGroupItemProvider.java @@ -150,7 +150,7 @@ public class ToolGroupItemProvider extends DocumentedElementItemProvider { @Override public String getText(Object object) { String label = new IdentifiedElementQuery(((ToolGroup) object)).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_ToolGroup_type") : getString("_UI_ToolGroup_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_ToolGroup_type") : getString("_UI_ToolGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java index 108a86d94e..678422c7fc 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/tool/provider/ToolSectionItemProvider.java @@ -197,7 +197,7 @@ public class ToolSectionItemProvider extends DocumentedElementItemProvider { @Override public String getText(Object object) { String label = new IdentifiedElementQuery((ToolSection) object).getLabel(); - return label == null || label.length() == 0 ? getString("_UI_ToolSection_type") : getString("_UI_ToolSection_type") + " " + label; + return label == null || label.length() == 0 ? getString("_UI_ToolSection_type") : getString("_UI_ToolSection_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java index 99e7a1fb57..1a75f1d52a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DEdgeItemProvider.java @@ -309,7 +309,7 @@ public class DEdgeItemProvider extends DDiagramElementItemProvider { @Override public String getText(Object object) { String label = ((DEdge) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DEdge_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DEdge_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java index ecd887a154..81459e14e4 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeContainerItemProvider.java @@ -125,7 +125,7 @@ public class DNodeContainerItemProvider extends DDiagramElementContainerItemProv @Override public String getText(Object object) { String label = ((DNodeContainer) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DNodeContainer_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DNodeContainer_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java index 9f3beb5027..d38cb95b1a 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeItemProvider.java @@ -259,7 +259,7 @@ public class DNodeItemProvider extends DDiagramElementItemProvider { @Override public String getText(Object object) { String label = ((DNode) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DNode_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DNode_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java index 0ad0590601..7414f12332 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListElementItemProvider.java @@ -168,7 +168,7 @@ public class DNodeListElementItemProvider extends DDiagramElementItemProvider { @Override public String getText(Object object) { String label = ((DNodeListElement) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DNodeListElement_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DNodeListElement_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java index 4acaf2536f..976ea44018 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DNodeListItemProvider.java @@ -108,7 +108,7 @@ public class DNodeListItemProvider extends DDiagramElementContainerItemProvider @Override public String getText(Object object) { String label = ((DNodeList) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DNodeList_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DNodeList_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java index 22c9fcdfe7..e04ff704c2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/provider/DSemanticDiagramItemProvider.java @@ -88,7 +88,7 @@ public class DSemanticDiagramItemProvider extends DDiagramItemProvider { @Override public String getText(Object object) { String label = ((DSemanticDiagram) object).getName(); - return label == null || label.length() == 0 ? getString("_UI_DSemanticDiagram_type") : label; + return label == null || label.length() == 0 ? getString("_UI_DSemanticDiagram_type") : label; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java index 926d6d6d66..693084f944 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/ui/provider/DiagramUIPlugin.java @@ -65,7 +65,7 @@ import org.osgi.framework.BundleContext; */ public final class DiagramUIPlugin extends EMFPlugin { - private static final String DECORATOR_CHECK_PATH = "icons/full/decorator/active.gif"; + private static final String DECORATOR_CHECK_PATH = "icons/full/decorator/active.gif"; //$NON-NLS-1$ public static final String ID = "org.eclipse.sirius.diagram.ui"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java index 9eb214d930..9c505e1a0c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/image/DiagramImagesPath.java @@ -141,7 +141,7 @@ public interface DiagramImagesPath { String FOLD_DECORATOR = DEFAULT_DECORATOR_PATH + "fold"; //$NON-NLS-1$ /** path to image not found. */ - String IMAGE_NOT_FOUND = "/org.eclipse.sirius.common.ui/images/NotFound.png"; + String IMAGE_NOT_FOUND = "/org.eclipse.sirius.common.ui/images/NotFound.png"; //$NON-NLS-1$ /** path of the palette edge image. */ String PALETTE_EDGE_PATH = "/org.eclipse.sirius.diagram.ui/icons/full/obj16/DEdge.gif"; //$NON-NLS-1$ @@ -152,18 +152,18 @@ public interface DiagramImagesPath { /** * Path of the action's image to distribute centers horizontally. */ - String DISTRIBUTE_CENTERS_HORIZONTALLY = "icons/distributeCentersHorizontal.gif"; + String DISTRIBUTE_CENTERS_HORIZONTALLY = "icons/distributeCentersHorizontal.gif"; //$NON-NLS-1$ /** * Path of the action's image to distribute with uniform gaps horizontally. */ - String DISTRIBUTE_WITH_UNIFORM_GAPS_HORIZONTALLY = "icons/distributeWithUniformGapHorizontal.gif"; + String DISTRIBUTE_WITH_UNIFORM_GAPS_HORIZONTALLY = "icons/distributeWithUniformGapHorizontal.gif"; //$NON-NLS-1$ /** * Path of the action's image to distribute middle vertically. */ - String DISTRIBUTE_CENTERS_VERTICALLY = "icons/distributeCentersVertical.gif"; + String DISTRIBUTE_CENTERS_VERTICALLY = "icons/distributeCentersVertical.gif"; //$NON-NLS-1$ /** Path of the action's image to distribute with uniform gaps vertically. */ - String DISTRIBUTE_WITH_UNIFORM_GAPS_VERTICALLY = "icons/distributeWithUniformGapVertical.gif"; + String DISTRIBUTE_WITH_UNIFORM_GAPS_VERTICALLY = "icons/distributeWithUniformGapVertical.gif"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/diagramtype/DiagramTypeDescriptorRegistry.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/diagramtype/DiagramTypeDescriptorRegistry.java index e226c6581a..a9a0668d32 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/diagramtype/DiagramTypeDescriptorRegistry.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/diagramtype/DiagramTypeDescriptorRegistry.java @@ -35,13 +35,13 @@ import org.eclipse.sirius.viewpoint.SiriusPlugin; public final class DiagramTypeDescriptorRegistry { /** Diagram type extension point ID. */ - private static final String DIAGRAM_TYPE_EP_ID = "org.eclipse.sirius.diagram.diagramTypeProvider"; + private static final String DIAGRAM_TYPE_EP_ID = "org.eclipse.sirius.diagram.diagramTypeProvider"; //$NON-NLS-1$ /** The diagram description provider attribute. */ - private static final String DIAGRAM_DESCRIPTION_PROVIDER_ATTR = "descriptionProvider"; + private static final String DIAGRAM_DESCRIPTION_PROVIDER_ATTR = "descriptionProvider"; //$NON-NLS-1$ /** The label attribute. */ - private static final String LABEL_ATTRIBUTE = "label"; + private static final String LABEL_ATTRIBUTE = "label"; //$NON-NLS-1$ private static DiagramTypeDescriptorRegistry instance; diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/CanonicalSynchronizerFactory.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/CanonicalSynchronizerFactory.java index 9576bec3bb..f72ad1b924 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/CanonicalSynchronizerFactory.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/CanonicalSynchronizerFactory.java @@ -27,12 +27,12 @@ public interface CanonicalSynchronizerFactory { /** * The extension point ID. */ - String ID = "org.eclipse.sirius.diagram.canonicalSynchronizerFactoryOverride"; + String ID = "org.eclipse.sirius.diagram.canonicalSynchronizerFactoryOverride"; //$NON-NLS-1$ /** * Extension point attribute for the factory class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/DiagramCreationUtil.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/DiagramCreationUtil.java index 2aa19d2ba4..1c85f40bbf 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/DiagramCreationUtil.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/api/refresh/DiagramCreationUtil.java @@ -85,11 +85,11 @@ public final class DiagramCreationUtil { } private PreferencesHint getPreferencesHint() { - return new PreferencesHint("org.eclipse.sirius.diagram"); + return new PreferencesHint("org.eclipse.sirius.diagram"); //$NON-NLS-1$ } private String getDiagramKind() { - return "Sirius"; + return "Sirius"; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/color/DiagramDefaultColorStyleDescription.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/color/DiagramDefaultColorStyleDescription.java index 053dacc37b..0e969a2987 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/color/DiagramDefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/color/DiagramDefaultColorStyleDescription.java @@ -38,9 +38,9 @@ import org.eclipse.sirius.viewpoint.description.style.LabelStyleDescription; */ public class DiagramDefaultColorStyleDescription extends StyleSwitch<EObject> { - private static final String BLACK = "black"; + private static final String BLACK = "black"; //$NON-NLS-1$ - private static final String GRAY = "gray"; + private static final String GRAY = "gray"; //$NON-NLS-1$ /** * Set the default color descriptions on the given EObject. @@ -129,7 +129,7 @@ public class DiagramDefaultColorStyleDescription extends StyleSwitch<EObject> { */ @Override public EObject caseNoteDescription(final NoteDescription object) { - object.setColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("yellow")); + object.setColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("yellow")); //$NON-NLS-1$ return super.caseNoteDescription(object); } @@ -147,8 +147,8 @@ public class DiagramDefaultColorStyleDescription extends StyleSwitch<EObject> { */ @Override public EObject caseFlatContainerStyleDescription(final FlatContainerStyleDescription object) { - object.setForegroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("light_gray")); - object.setBackgroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("white")); + object.setForegroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("light_gray")); //$NON-NLS-1$ + object.setBackgroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("white")); //$NON-NLS-1$ return super.caseFlatContainerStyleDescription(object); } @@ -157,7 +157,7 @@ public class DiagramDefaultColorStyleDescription extends StyleSwitch<EObject> { */ @Override public EObject caseShapeContainerStyleDescription(final ShapeContainerStyleDescription object) { - object.setBackgroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("light_gray")); + object.setBackgroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("light_gray")); //$NON-NLS-1$ return super.caseShapeContainerStyleDescription(object); } @@ -176,7 +176,7 @@ public class DiagramDefaultColorStyleDescription extends StyleSwitch<EObject> { @Override public EObject caseGaugeSectionDescription(final GaugeSectionDescription object) { object.setBackgroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription(BLACK)); - object.setForegroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("green")); + object.setForegroundColor(EnvironmentSystemColorFactory.getDefault().getSystemColorDescription("green")); //$NON-NLS-1$ return super.caseGaugeSectionDescription(object); } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialect.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialect.java index a5ed39fa16..8ed4a1e740 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialect.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/DiagramDialect.java @@ -28,7 +28,7 @@ public class DiagramDialect implements Dialect { * {@inheritDoc} */ public String getName() { - return "diagram"; + return "diagram"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionQuery.java index d4033f1ebd..1606784030 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionQuery.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/dialect/description/DiagramInterpretedExpressionQuery.java @@ -75,17 +75,17 @@ import com.google.common.collect.Sets; */ public class DiagramInterpretedExpressionQuery extends AbstractInterpretedExpressionQuery implements IInterpretedExpressionQuery { - private static final String DIAGRAM_D_SEMANTIC_DIAGRAM = "diagram.DSemanticDiagram"; + private static final String DIAGRAM_D_SEMANTIC_DIAGRAM = "diagram.DSemanticDiagram"; //$NON-NLS-1$ - private static final String DIAGRAM_D_NODE = "diagram.DNode"; + private static final String DIAGRAM_D_NODE = "diagram.DNode"; //$NON-NLS-1$ - private static final String DIAGRAM_D_NODE_LIST = "diagram.DNodeList"; + private static final String DIAGRAM_D_NODE_LIST = "diagram.DNodeList"; //$NON-NLS-1$ - private static final String DIAGRAM_D_NODE_CONTAINER = "diagram.DNodeContainer"; + private static final String DIAGRAM_D_NODE_CONTAINER = "diagram.DNodeContainer"; //$NON-NLS-1$ - private static final String DIAGRAM_D_EDGE_TYPE = "diagram.DEdge"; + private static final String DIAGRAM_D_EDGE_TYPE = "diagram.DEdge"; //$NON-NLS-1$ - private static final String DIAGRAM_EDGE_TARGET_TYPE = "diagram.EdgeTarget"; + private static final String DIAGRAM_EDGE_TARGET_TYPE = "diagram.EdgeTarget"; //$NON-NLS-1$ /** * Default constructor. @@ -177,11 +177,11 @@ public class DiagramInterpretedExpressionQuery extends AbstractInterpretedExpres * find specific variables for concrete types. */ if (target instanceof EdgeCreationDescription && ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__PRECONDITION.equals(feature)) { - availableVariables.put("diagram", VariableType.fromString("diagram.DDiagram")); - availableVariables.put("preSource", VariableType.fromString("ecore.EObject")); - availableVariables.put("preSourceView", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); - availableVariables.put("preTarget", VariableType.fromString("ecore.EObject")); - availableVariables.put("preTargetView", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); + availableVariables.put("diagram", VariableType.fromString("diagram.DDiagram")); //$NON-NLS-1$ //$NON-NLS-2$ + availableVariables.put("preSource", VariableType.fromString("ecore.EObject")); //$NON-NLS-1$ //$NON-NLS-2$ + availableVariables.put("preSourceView", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); //$NON-NLS-1$ + availableVariables.put("preTarget", VariableType.fromString("ecore.EObject")); //$NON-NLS-1$ //$NON-NLS-2$ + availableVariables.put("preTargetView", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); //$NON-NLS-1$ } return availableVariables; @@ -192,9 +192,9 @@ public class DiagramInterpretedExpressionQuery extends AbstractInterpretedExpres super.addVariableFromCreateOperation(modelOperation); if (modelOperation instanceof CreateEdgeView) { - availableVariables.put(((CreateEdgeView) modelOperation).getVariableName(), VariableType.fromString("diagram.DEdge")); + availableVariables.put(((CreateEdgeView) modelOperation).getVariableName(), VariableType.fromString("diagram.DEdge")); //$NON-NLS-1$ } else if (modelOperation instanceof CreateView) { - availableVariables.put(((CreateView) modelOperation).getVariableName(), VariableType.fromString("viewpoint.DView")); + availableVariables.put(((CreateView) modelOperation).getVariableName(), VariableType.fromString("viewpoint.DView")); //$NON-NLS-1$ } } @@ -208,8 +208,8 @@ public class DiagramInterpretedExpressionQuery extends AbstractInterpretedExpres if (toolContext instanceof ReconnectEdgeDescription) { ReconnectEdgeDescription tool = (ReconnectEdgeDescription) toolContext; declareEdgeSourceTargets(availableVariables, tool.getMappings(), Collections.<DiagramElementMapping> emptyList(), Collections.<DiagramElementMapping> emptyList()); - availableVariables.put("otherEnd", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); - availableVariables.put("edgeView", VariableType.fromString(DIAGRAM_D_EDGE_TYPE)); + availableVariables.put("otherEnd", VariableType.fromString(DIAGRAM_EDGE_TARGET_TYPE)); //$NON-NLS-1$ + availableVariables.put("edgeView", VariableType.fromString(DIAGRAM_D_EDGE_TYPE)); //$NON-NLS-1$ Collection<String> possibleSources = Lists.newArrayList(); for (EdgeMapping eMapping : tool.getMappings()) { @@ -264,14 +264,14 @@ public class DiagramInterpretedExpressionQuery extends AbstractInterpretedExpres collectPotentialContainerTypes(Sets.<String> newLinkedHashSet(), possibleContainerViewTypes, mapping); } refineVariableType(availableVariables, IInterpreterSiriusVariables.ELEMENT, possibleSemanticTypes); - refineVariableType(availableVariables, "elementView", possibleViewTypes); - refineVariableType(availableVariables, "containerView", possibleContainerViewTypes); + refineVariableType(availableVariables, "elementView", possibleViewTypes); //$NON-NLS-1$ + refineVariableType(availableVariables, "containerView", possibleContainerViewTypes); //$NON-NLS-1$ } if (toolContext instanceof OperationAction) { OperationAction tool = (OperationAction) toolContext; if (new EObjectQuery(tool).getFirstAncestorOfType(DescriptionPackage.Literals.DIAGRAM_DESCRIPTION).some()) { - availableVariables.put("diagram", VariableType.fromString(DIAGRAM_D_SEMANTIC_DIAGRAM)); + availableVariables.put("diagram", VariableType.fromString(DIAGRAM_D_SEMANTIC_DIAGRAM)); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramElementSynchronizer.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramElementSynchronizer.java index c0f72b3638..bb8fd4cad6 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramElementSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramElementSynchronizer.java @@ -437,16 +437,16 @@ public class DDiagramElementSynchronizer { if (!StringUtil.isEmpty(edgeStyleDescription.getEndLabelStyleDescription().getLabelExpression())) { final String label = computeLabel(edge, edgeStyleDescription.getEndLabelStyleDescription()); edge.setEndLabel(label); - if (!("".equals(edge.getEndLabel()) && label == null)) { + if (!("".equals(edge.getEndLabel()) && label == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) edge.setEndLabel(label); } } else if (!StringUtil.isEmpty(edge.getName())) { - edge.setName(""); + edge.setName(""); //$NON-NLS-1$ } } else if (!StringUtil.isEmpty(edge.getEndLabel())) { - edge.setEndLabel(""); + edge.setEndLabel(""); //$NON-NLS-1$ } } @@ -458,17 +458,17 @@ public class DDiagramElementSynchronizer { if (edgeStyleDescription.getBeginLabelStyleDescription() != null) { if (!StringUtil.isEmpty(edgeStyleDescription.getBeginLabelStyleDescription().getLabelExpression())) { final String label = computeLabel(edge, edgeStyleDescription.getBeginLabelStyleDescription()); - if (!("".equals(edge.getBeginLabel()) && label == null)) { + if (!("".equals(edge.getBeginLabel()) && label == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) edge.setBeginLabel(label); } } else if (!StringUtil.isEmpty(edge.getName())) { - edge.setName(""); + edge.setName(""); //$NON-NLS-1$ } } else if (!StringUtil.isEmpty(edge.getBeginLabel())) { - edge.setBeginLabel(""); + edge.setBeginLabel(""); //$NON-NLS-1$ } } @@ -480,16 +480,16 @@ public class DDiagramElementSynchronizer { if (edgeStyleDescription.getCenterLabelStyleDescription() != null) { if (!StringUtil.isEmpty(edgeStyleDescription.getCenterLabelStyleDescription().getLabelExpression())) { final String label = computeLabel(edge, edgeStyleDescription.getCenterLabelStyleDescription()); - if (!("".equals(edge.getName()) && label == null)) { + if (!("".equals(edge.getName()) && label == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) edge.setName(label); } } else if (!StringUtil.isEmpty(edge.getName())) { - edge.setName(""); + edge.setName(""); //$NON-NLS-1$ } } else if (!StringUtil.isEmpty(edge.getName())) { - edge.setName(""); + edge.setName(""); //$NON-NLS-1$ } } @@ -525,7 +525,7 @@ public class DDiagramElementSynchronizer { final NodeStyleDescription style = (NodeStyleDescription) this.mappingHelper.getBestStyleDescription(newNode.getActualMapping(), newNode.getTarget(), newNode, container.getTarget(), diagram); if (style != null) { - if (!StringUtil.isEmpty(style.getLabelExpression()) && !("".equals(newNode.getName()) && computeLabel(newNode, style) == null)) { + if (!StringUtil.isEmpty(style.getLabelExpression()) && !("".equals(newNode.getName()) && computeLabel(newNode, style) == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) newNode.setName(computeLabel(newNode, style)); @@ -557,7 +557,7 @@ public class DDiagramElementSynchronizer { if (containerStyleDescription != null) { if (!StringUtil.isEmpty(containerStyleDescription.getLabelExpression())) { String computeLabel = computeLabel(container, containerStyleDescription); - if (!("".equals(container.getName()) && computeLabel == null)) { + if (!("".equals(container.getName()) && computeLabel == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) container.setName(computeLabel); @@ -600,7 +600,7 @@ public class DDiagramElementSynchronizer { if (nodeStyleDescription != null) { if (!StringUtil.isEmpty(nodeStyleDescription.getLabelExpression())) { String computeLabel = computeLabel(newNode, nodeStyleDescription); - if (!("".equals(newNode.getName()) && computeLabel == null)) { + if (!("".equals(newNode.getName()) && computeLabel == null)) { //$NON-NLS-1$ // This is a workaround for a CDO issue in legacy mode // (https://bugs.eclipse.org/bugs/show_bug.cgi?id=404152) newNode.setName(computeLabel); diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramSynchronizer.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramSynchronizer.java index 3365b22df9..4acd83b2ea 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DDiagramSynchronizer.java @@ -683,7 +683,7 @@ public class DDiagramSynchronizer { } private void convertType(final EObject eObject) { - final EStructuralFeature typeEFeature = eObject.eClass().getEStructuralFeature("type"); + final EStructuralFeature typeEFeature = eObject.eClass().getEStructuralFeature("type"); //$NON-NLS-1$ if (typeEFeature != null) { if (visualIDMap.containsKey(eObject.eGet(typeEFeature))) { eObject.eSet(typeEFeature, visualIDMap.get(eObject.eGet(typeEFeature))); @@ -744,7 +744,7 @@ public class DDiagramSynchronizer { } private List<?> getChildren(final EObject eObject) { - final EStructuralFeature childrenEFeature = eObject.eClass().getEStructuralFeature("children"); + final EStructuralFeature childrenEFeature = eObject.eClass().getEStructuralFeature("children"); //$NON-NLS-1$ if (childrenEFeature != null) { final EList<?> children = (EList<?>) eObject.eGet(childrenEFeature); return children; @@ -819,7 +819,7 @@ public class DDiagramSynchronizer { IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1); try { - subMonitor.beginTask("", addedNodes.size()); + subMonitor.beginTask("", addedNodes.size()); //$NON-NLS-1$ /* now refresh the mappings owned by container mappings */ for (final DDiagramElement newElem : addedNodes) { if (newElem instanceof DDiagramElementContainer) { @@ -998,7 +998,7 @@ public class DDiagramSynchronizer { final Collection<AbstractDNode> keptNodes, final Collection<AbstractDNode> createdNodes, IProgressMonitor monitor) { try { Iterable<AbstractDNodeCandidate> allElements = status.getAllElements(); - monitor.beginTask("", Iterables.size(allElements)); + monitor.beginTask("", Iterables.size(allElements)); //$NON-NLS-1$ final boolean createContents = this.accessor.getPermissionAuthority().canCreateIn(viewContainer) && new DiagramElementMappingQuery(mapping).isSynchronizedAndCreateElement(diagram); final RefreshOrderHelper refreshOrderHelper = new RefreshOrderHelper(viewContainer, mapping); diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DEdgeCandidate.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DEdgeCandidate.java index c4b5423bec..0816e37216 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DEdgeCandidate.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/DEdgeCandidate.java @@ -167,7 +167,7 @@ public class DEdgeCandidate { parts[1] = (semantic == null) ? 0 : getSemanticURI().hashCode(); parts[2] = (sourceView == null) ? 0 : getSourceViewURI(); parts[3] = (targetView == null) ? 0 : getTargetViewURI(); - final String sep = "/"; + final String sep = "/"; //$NON-NLS-1$ return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1] + sep + parts[2] + sep + parts[3]); } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/VisualIDMap.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/VisualIDMap.java index d74e8c8a7d..f7eaf26c2b 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/VisualIDMap.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/experimental/sync/VisualIDMap.java @@ -28,19 +28,19 @@ public class VisualIDMap extends HashMap<String, String> { */ public VisualIDMap() { // DNodeContainerEditPart <-> DNodeListEditPart - addEntry("2002", "2003"); + addEntry("2002", "2003"); //$NON-NLS-1$ //$NON-NLS-2$ // DNodeContainerNameEditPart <-> DNodeListNameEditPart - addEntry("5006", "5007"); + addEntry("5006", "5007"); //$NON-NLS-1$ //$NON-NLS-2$ // DNodeContainerViewNodeContainerCompartmentEditPart <-> // DNodeListViewNodeContainerCompartment2EditPart - addEntry("7001", "7004"); + addEntry("7001", "7004"); //$NON-NLS-1$ //$NON-NLS-2$ // DNodeContainer2EditPart <-> DNodeList2EditPart - addEntry("3008", "3009"); + addEntry("3008", "3009"); //$NON-NLS-1$ //$NON-NLS-2$ // DNodeContainer2NameEditPart <-> DNodeListName2EditPart - addEntry("5005", "5004"); + addEntry("5005", "5004"); //$NON-NLS-1$ //$NON-NLS-2$ // DNodeContainerViewNodeListCompartment2EditPart <-> // DNodeListViewNodeListCompartmentEditPart - addEntry("7002", "7003"); + addEntry("7002", "7003"); //$NON-NLS-1$ //$NON-NLS-2$ } private void addEntry(String s1, String s2) { diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java index 34f8efaf13..a82643bc35 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java @@ -158,7 +158,7 @@ public class ContainerMappingSpec extends ContainerMappingImpl implements IConta */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingSpec.java index f7ea46643e..c3f72fc40b 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingSpec.java @@ -148,7 +148,7 @@ public class EdgeMappingSpec extends EdgeMappingImpl { */ @Override public String toString() { - return getClass().getName() + " " + getName(); + return getClass().getName() + " " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java index d8cefca395..b749880adc 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java @@ -176,7 +176,7 @@ public class NodeMappingSpec extends NodeMappingImpl implements INodeMappingExt */ @Override public String toString() { - return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); + return new StringBuffer(getClass().getName()).append(" ").append(getName()).toString(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java index ed3902fc66..c6b1354b26 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java @@ -28,7 +28,7 @@ public class BeginLabelStyleDescriptionSpec extends BeginLabelStyleDescriptionIm * @not-generated * @ordered */ - protected static final String LABEL_EXPRESSION_EDEFAULT = ""; + protected static final String LABEL_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java index c78afaf272..d0f2c29245 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java @@ -29,7 +29,7 @@ public class CenterLabelStyleDescriptionSpec extends CenterLabelStyleDescription * @not-generated * @ordered */ - protected static final String LABEL_EXPRESSION_EDEFAULT = ""; + protected static final String LABEL_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java index 8e0b1d2887..d95c46e70c 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java @@ -28,7 +28,7 @@ public class EndLabelStyleDescriptionSpec extends EndLabelStyleDescriptionImpl { * @not-generated * @ordered */ - protected static final String LABEL_EXPRESSION_EDEFAULT = ""; + protected static final String LABEL_EXPRESSION_EDEFAULT = ""; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java index cdc02ca63a..7dc1f5250d 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java @@ -53,7 +53,7 @@ public class BestStyleDescriptionRegistry extends HashMap<BestStyleDescriptionKe * The key of the annotation containing the cache of computed * {@link StyleDescription}. */ - public static final String DANNOTATION_CUSTOMIZATION_KEY = "DANNOTATION_CUSTOMIZATION_KEY"; + public static final String DANNOTATION_CUSTOMIZATION_KEY = "DANNOTATION_CUSTOMIZATION_KEY"; //$NON-NLS-1$ private static final long serialVersionUID = 1L; diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java index 0e02c4834a..b9ffb0cfc0 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java @@ -488,7 +488,7 @@ public final class EdgeMappingHelper { final Session session = SessionManager.INSTANCE.getSession(model); for (final Resource resource : session.getSemanticResources()) { for (final EObject root : resource.getContents()) { - semanticCandidates.addAll(extPackage.eAllContents(root, "EObject")); + semanticCandidates.addAll(extPackage.eAllContents(root, "EObject")); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java index 5e3cb4d894..e35726db1f 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/helper/StyleHelper.java @@ -965,7 +965,7 @@ public final class StyleHelper { private Integer computeExpressions(EObject target, SizeComputationContainerStyleDescription description, EStructuralFeature feature) { Integer size = null; Object expression = description.eGet(feature); - if (expression instanceof String && !StringUtil.isEmpty((String) expression) && !((String) expression).equals("-1")) { + if (expression instanceof String && !StringUtil.isEmpty((String) expression) && !((String) expression).equals("-1")) { //$NON-NLS-1$ try { size = interpreter.evaluateInteger(target, (String) expression); if (size == null) { diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java index 1da9e28509..07e20f5530 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java @@ -95,7 +95,7 @@ public class DEdgeSpec extends DEdgeImpl { @Override public String toString() { if (getTargetNode() != null && getSourceNode() != null) { - return "Edge source:" + getSourceNode() + " | target:" + getTargetNode() + " on semantic" + getTarget(); + return "Edge source:" + getSourceNode() + " | target:" + getTargetNode() + " on semantic" + getTarget(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { return super.toString(); } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java index 4ad04327d1..b997121008 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java @@ -173,7 +173,7 @@ public class DNodeContainerSpec extends DNodeContainerImpl { */ @Override public String toString() { - return getName() != null ? getName() : ""; + return getName() != null ? getName() : ""; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java index f227955932..c90ff9f722 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java @@ -172,6 +172,6 @@ public class DNodeListSpec extends DNodeListImpl { */ @Override public String toString() { - return "NodeList " + getName(); + return "NodeList " + getName(); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java index 09e5193edc..1a8d750dc7 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java @@ -104,13 +104,13 @@ public class DNodeSpec extends DNodeImpl { */ @Override public String toString() { - final StringBuffer result = new StringBuffer("Node"); + final StringBuffer result = new StringBuffer("Node"); //$NON-NLS-1$ if (getName() != null && getName().length() > 0) { - result.append(" "); + result.append(" "); //$NON-NLS-1$ result.append(getName()); } if (getTarget() != null) { - result.append(" --> "); + result.append(" --> "); //$NON-NLS-1$ result.append(getTarget().toString()); } return result.toString(); diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java index d8130f50b7..9b243b7120 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java @@ -35,7 +35,7 @@ import org.osgi.framework.Version; public class ComputedStyleDescriptionCachePackingFileMigrationParticipant extends AbstractRepresentationsFileMigrationParticipant { /** The VP version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("10.0.0.201502231700"); + public static final Version MIGRATION_VERSION = new Version("10.0.0.201502231700"); //$NON-NLS-1$ @Override protected void postLoad(DAnalysis dAnalysis, Version loadedVersion) { diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/RepairRepresentationRefresher.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/RepairRepresentationRefresher.java index 844b5cfaeb..ab616221ca 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/RepairRepresentationRefresher.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/RepairRepresentationRefresher.java @@ -97,7 +97,7 @@ public class RepairRepresentationRefresher { final AnyType viewSettings = extension.get(view); if (viewSettings != null) { for (final FeatureMap.Entry feature : viewSettings.getMixed()) { - if ("model".equals(feature.getEStructuralFeature().getName())) { + if ("model".equals(feature.getEStructuralFeature().getName())) { //$NON-NLS-1$ ((DAnalysis) view.eContainer()).getModels().add(EcoreUtil.resolve((EObject) feature.getValue(), view.eResource().getResourceSet())); hasAlreadyModel = true; } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/AbstractLostElementDataWithTarget.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/AbstractLostElementDataWithTarget.java index ecd29f1069..462aac33ed 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/AbstractLostElementDataWithTarget.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/AbstractLostElementDataWithTarget.java @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject; public abstract class AbstractLostElementDataWithTarget extends AbstractLostElementData implements ILostElementDataWithTarget { /** Separator for toString. */ - protected static final String SEPARATOR = " |--| "; + protected static final String SEPARATOR = " |--| "; //$NON-NLS-1$ private EObject target; @@ -43,6 +43,6 @@ public abstract class AbstractLostElementDataWithTarget extends AbstractLostElem */ @Override public String toString() { - return super.toString() + SEPARATOR + "Target: " + target; + return super.toString() + SEPARATOR + "Target: " + target; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java index 5983f9cf5d..6fa671947c 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DeletionCommandBuilder.java @@ -148,7 +148,7 @@ public class DeletionCommandBuilder extends AbstractDiagramCommandBuilder { final DCommand cmd = createEnclosingCommand(); cmd.getTasks().add(new DeleteEObjectTask(diagramElement, modelAccessor)); - final List<EObject> contents = Lists.newArrayList(this.modelAccessor.eAllContents(diagramElement, "EdgeTarget")); + final List<EObject> contents = Lists.newArrayList(this.modelAccessor.eAllContents(diagramElement, "EdgeTarget")); //$NON-NLS-1$ contents.add(diagramElement); for (final EObject element : contents) { if (element instanceof EdgeTarget) { diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java index c67cb4736d..b15cf0c916 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/DirectEditCommandBuilder.java @@ -58,7 +58,7 @@ public class DirectEditCommandBuilder extends AbstractDiagramCommandBuilder { /* * First we need to init the mask variables. */ - String messageFormat = "$0"; + String messageFormat = "$0"; //$NON-NLS-1$ if (directEditTool.getMask() != null) { messageFormat = directEditTool.getMask().getMask(); } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java index 0ef3be8f3c..bd6b15d72f 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java @@ -173,11 +173,11 @@ public class ReconnectionCommandBuilder extends AbstractDiagramCommandBuilder { } private String getReconnectionKindFeatureName() { - String featureName = "sourceNode"; + String featureName = "sourceNode"; //$NON-NLS-1$ if (tool.getReconnectionKind() == ReconnectionKind.RECONNECT_TARGET_LITERAL) { - featureName = "targetNode"; + featureName = "targetNode"; //$NON-NLS-1$ } else if (tool.getReconnectionKind() == ReconnectionKind.RECONNECT_BOTH_LITERAL && oldTarget == reconnectionSource) { - featureName = "targetNode"; + featureName = "targetNode"; //$NON-NLS-1$ } return featureName; } @@ -288,7 +288,7 @@ public class ReconnectionCommandBuilder extends AbstractDiagramCommandBuilder { */ public static class OtherEndVariable extends ElementSelectVariableImpl implements SubVariable { - private static final String OTHER_END_VARIABLE_NAME = "otherEnd"; + private static final String OTHER_END_VARIABLE_NAME = "otherEnd"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java index 72565a86e6..4fdf0c0b01 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java @@ -37,52 +37,52 @@ public class ContainerMappingChildrenPresentationConstraints extends AbstractCon /** * Compartment containment rule ID. */ - public static final String COMPARTMENT_CONTAINMENT_RULE_ID = "org.eclipse.sirius.diagram.constraints.CompartmentContainmentConstraint"; + public static final String COMPARTMENT_CONTAINMENT_RULE_ID = "org.eclipse.sirius.diagram.constraints.CompartmentContainmentConstraint"; //$NON-NLS-1$ /** * Reuse containers in ContainerList rule ID. */ - public static final String REUSE_CONTAINERS_IN_CONTAINER_LIST_RULE_ID = "org.eclipse.sirius.diagram.constraints.ReuseContainersInContainerListConstraint"; + public static final String REUSE_CONTAINERS_IN_CONTAINER_LIST_RULE_ID = "org.eclipse.sirius.diagram.constraints.ReuseContainersInContainerListConstraint"; //$NON-NLS-1$ /** * Containers in ContainerList rule ID. */ - public static final String CONTAINERS_IN_CONTAINER_LIST_RULE_ID = "org.eclipse.sirius.diagram.constraints.ContainersInContainerListConstraint"; + public static final String CONTAINERS_IN_CONTAINER_LIST_RULE_ID = "org.eclipse.sirius.diagram.constraints.ContainersInContainerListConstraint"; //$NON-NLS-1$ /** * Reused Nodes in RegionContainer rule ID. */ - public static final String REUSE_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoReusedNodesInRegionContainerConstraint"; + public static final String REUSE_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoReusedNodesInRegionContainerConstraint"; //$NON-NLS-1$ /** * Reused BorderedNodes in Region rule ID. */ - public static final String REUSE_BORDERED_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoReusedBorderedNodesInRegion"; + public static final String REUSE_BORDERED_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoReusedBorderedNodesInRegion"; //$NON-NLS-1$ /** * Nodes in RegionContainer rule ID. */ - public static final String NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoSubNodesInRegionContainerConstraint"; + public static final String NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoSubNodesInRegionContainerConstraint"; //$NON-NLS-1$ /** * BorderedNodes in RegionContainer rule ID. */ - public static final String BORDERED_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoBorderedNodesInRegion"; + public static final String BORDERED_NODES_IN_REGION_CONTAINER_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoBorderedNodesInRegion"; //$NON-NLS-1$ /** * Mapping filter on region mapping rule ID. */ - public static final String MAPPING_FILTER_ON_REGION_MAPPING_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoMappingFilterOnRegionsConstraint"; + public static final String MAPPING_FILTER_ON_REGION_MAPPING_RULE_ID = "org.eclipse.sirius.diagram.constraints.NoMappingFilterOnRegionsConstraint"; //$NON-NLS-1$ /** * Style hierarchy rule ID. */ - public static final String REGION_REGION_CONTAINER_MAPPING_STYLE_RULE_ID = "org.eclipse.sirius.diagram.constraints.RegionStyleConstraint"; + public static final String REGION_REGION_CONTAINER_MAPPING_STYLE_RULE_ID = "org.eclipse.sirius.diagram.constraints.RegionStyleConstraint"; //$NON-NLS-1$ /** * Region mapping cardinality rule ID. */ - public static final String REGION_MAPPING_CARDINALITY_RULE_ID = "org.eclipse.sirius.diagram.constraints.RegionMappingCardinalityConstraint"; + public static final String REGION_MAPPING_CARDINALITY_RULE_ID = "org.eclipse.sirius.diagram.constraints.RegionMappingCardinalityConstraint"; //$NON-NLS-1$ @Override public IStatus validate(IValidationContext ctx) { diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java index da6c555a58..91ef302f73 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/DiagramExistingExpressionVariablesConstraint.java @@ -556,7 +556,7 @@ public class DiagramExistingExpressionVariablesConstraint extends AbstractConstr final MessageFormat parser = new MessageFormat(maskVariables.getMask()); for (int i = 0; i < parser.getFormats().length; i++) { result.add(Integer.valueOf(i).toString()); - result.add("arg" + Integer.valueOf(i).toString()); + result.add("arg" + Integer.valueOf(i).toString()); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDefaultLayerConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDefaultLayerConstraint.java index 839b791328..305b5e65a2 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDefaultLayerConstraint.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDefaultLayerConstraint.java @@ -34,7 +34,7 @@ public class ExistingDefaultLayerConstraint extends AbstractConstraint { if (DescriptionPackage.eINSTANCE.getDiagramDescription().isSuperTypeOf(eObj.eClass())) { DiagramDescription diagram = (DiagramDescription) eObj; if (diagram.getDefaultLayer() == null) { - status = ctx.createFailureStatus(new Object[] { "'" + diagram.getName() + "'" }); + status = ctx.createFailureStatus(new Object[] { "'" + diagram.getName() + "'" }); //$NON-NLS-1$ //$NON-NLS-2$ } } } diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDomainClassConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDomainClassConstraint.java index 5b37e4f936..a659ec0760 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDomainClassConstraint.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ExistingDomainClassConstraint.java @@ -34,7 +34,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage; public class ExistingDomainClassConstraint extends AbstractConstraint { /** The name of the DomainClass feature. */ - private static final String DOMAIN_CLASS_FEATURE = "domainClass"; + private static final String DOMAIN_CLASS_FEATURE = "domainClass"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/RepresentationExtensionDescriptionRegexConstraint.java b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/RepresentationExtensionDescriptionRegexConstraint.java index 62e27d436a..d8fe822d96 100644 --- a/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/RepresentationExtensionDescriptionRegexConstraint.java +++ b/plugins/org.eclipse.sirius.diagram/src-core/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/RepresentationExtensionDescriptionRegexConstraint.java @@ -45,7 +45,7 @@ public class RepresentationExtensionDescriptionRegexConstraint extends AbstractM * Pattern used to detect if a String is a Regex. For that, we watching the * following characters : * [ ] ( ) ? */ - private static final Pattern REGEX_PATTERN = Pattern.compile("[^\\?\\*\\[\\]\\(\\)]*"); + private static final Pattern REGEX_PATTERN = Pattern.compile("[^\\?\\*\\[\\]\\(\\)]*"); //$NON-NLS-1$ @Override public IStatus validate(IValidationContext ctx) { diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/preferences/DiagramPreferenceInitializer.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/preferences/DiagramPreferenceInitializer.java index b096a2de2b..c2d7d8246d 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/preferences/DiagramPreferenceInitializer.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/internal/preferences/DiagramPreferenceInitializer.java @@ -33,7 +33,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer diagramCoreDefaultPreferences.putBoolean(SiriusDiagramPreferencesKeys.PREF_MOVE_NOTES_DURING_LATOUT.name(), false); diagramCoreDefaultPreferences.putBoolean(SiriusDiagramPreferencesKeys.PREF_CLIPBOOARD_SUPPORT_ONLY_ON_NOTE.name(), false); diagramCoreDefaultPreferences.putBoolean(SiriusDiagramPreferencesKeys.PREF_DISPLAY_HEADER_SECTION.name(), true); - diagramCoreDefaultPreferences.putBoolean(SiriusDiagramPreferencesKeys.PREF_AUTO_PIN_ON_CREATE.name(), getValue("_Pref_AutoPinOnCreate")); + diagramCoreDefaultPreferences.putBoolean(SiriusDiagramPreferencesKeys.PREF_AUTO_PIN_ON_CREATE.name(), getValue("_Pref_AutoPinOnCreate")); //$NON-NLS-1$ diagramCoreDefaultPreferences.putBoolean(SiriusDiagramCorePreferences.PREF_ENABLE_OVERRIDE, SiriusDiagramCorePreferences.PREF_ENABLE_OVERRIDE_DEFAULT_VALUE); diagramCoreDefaultPreferences.putInt(SiriusDiagramCorePreferences.PREF_LINE_STYLE, SiriusDiagramCorePreferences.PREF_LINE_STYLE_DEFAULT_VALUE); diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java index a1e535eeff..5e19c8d65e 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/PinElementsAction.java @@ -33,7 +33,7 @@ public class PinElementsAction implements IExternalJavaAction { @Override public void execute(final Collection<? extends EObject> selections, final Map<String, Object> parameters) { - final Object viewObj = parameters.get("view"); + final Object viewObj = parameters.get("view"); //$NON-NLS-1$ if (viewObj instanceof DDiagramElement) { DDiagramElement dDiagramElement = (DDiagramElement) viewObj; new PinHelper().markAsPinned(dDiagramElement); diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java index f34bc094dd..c5dc102415 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/actions/pinning/UnpinElementsAction.java @@ -33,7 +33,7 @@ public class UnpinElementsAction implements IExternalJavaAction { @Override public void execute(final Collection<? extends EObject> selections, final Map<String, Object> parameters) { - Object viewObj = parameters.get("view"); + Object viewObj = parameters.get("view"); //$NON-NLS-1$ PinHelper pinHelper = new PinHelper(); if (viewObj instanceof DDiagramElement) { DDiagramElement dDiagramElement = (DDiagramElement) viewObj; diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ExtenderService.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ExtenderService.java index f88267fb12..0b41755274 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ExtenderService.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ExtenderService.java @@ -39,7 +39,7 @@ public final class ExtenderService { private static final String EXTENDER_PROVIDER_EXTENSION_POINT = "org.eclipse.sirius.ecore.extender.ExtenderProvider"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "extenderprovider"; + private static final String TAG_ENGINE = "extenderprovider"; //$NON-NLS-1$ private ExtenderService() { diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java index 8c39bec81a..f1ee2821e5 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/accessor/ModelAccessorsRegistry.java @@ -151,7 +151,7 @@ public class ModelAccessorsRegistry { } private String getMapKeyFromResource(final ResourceSet resourceSet) { - String uri = ""; + String uri = ""; //$NON-NLS-1$ final Resource airResource = getDiscriminantResource(resourceSet); if (airResource != null && airResource.getURI() != null) { uri = airResource.getURI().toString(); diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java index 8adb0ace04..5c52167313 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/api/permission/exception/LockedInstanceException.java @@ -53,16 +53,16 @@ public class LockedInstanceException extends RuntimeException { } private static String getText(EObject[] eObjects) { - String text = ""; + String text = ""; //$NON-NLS-1$ if (eObjects != null) { ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE); AdapterFactoryItemDelegator adapterFactoryItemDelegator = new AdapterFactoryItemDelegator(adapterFactory); for (int i = 0; i < eObjects.length; i++) { EObject eObject = eObjects[i]; if (eObject != null) { - text += adapterFactoryItemDelegator.getText(eObject) + " (" + eObject + ")"; + text += adapterFactoryItemDelegator.getText(eObject) + " (" + eObject + ")"; //$NON-NLS-1$ //$NON-NLS-2$ if (i != eObjects.length - 1) { - text += ", "; + text += ", "; //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/EcoreIntrinsicExtender.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/EcoreIntrinsicExtender.java index 693d1b3b01..c4cdda07d8 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/EcoreIntrinsicExtender.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/EcoreIntrinsicExtender.java @@ -51,7 +51,7 @@ import com.google.common.collect.Multimap; */ public class EcoreIntrinsicExtender extends AbstractMetamodelExtender { - private static final String SEPARATOR = "."; + private static final String SEPARATOR = "."; //$NON-NLS-1$ private static PackageRegistryIndex platformIndex = new PackageRegistryIndex(EPackage.Registry.INSTANCE, Predicates.<EPackage> alwaysTrue()); @@ -69,7 +69,7 @@ public class EcoreIntrinsicExtender extends AbstractMetamodelExtender { result = EcoreUtil.create(eClass); } } - if (result == null && name != null && name.indexOf("#") > 0) { + if (result == null && name != null && name.indexOf("#") > 0) { //$NON-NLS-1$ final URI eClassURI = URI.createURI(name); final EObject eobj = new ResourceSetImpl().getEObject(eClassURI, true); if (eobj instanceof EClass) { @@ -236,11 +236,11 @@ public class EcoreIntrinsicExtender extends AbstractMetamodelExtender { @Override public boolean eInstanceOf(final EObject instance, final String name) { - if ("EObject".equals(name) && instance != null) { + if ("EObject".equals(name) && instance != null) { //$NON-NLS-1$ return true; } boolean result = eInstanceOf(instance.eClass(), name); - if (!result && name != null && name.indexOf("#") > 0) { + if (!result && name != null && name.indexOf("#") > 0) { //$NON-NLS-1$ try { final URI eClassURI = URI.createURI(name); final EObject eobj = new ResourceSetImpl().getEObject(eClassURI, true); diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/PackageRegistryIndex.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/PackageRegistryIndex.java index f19db93d12..7a004c683b 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/PackageRegistryIndex.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/accessor/ecore/PackageRegistryIndex.java @@ -27,7 +27,7 @@ import com.google.common.collect.Multimap; * @author pcdavid */ public class PackageRegistryIndex { - private static final String SEPARATOR = "."; + private static final String SEPARATOR = "."; //$NON-NLS-1$ private final EPackage.Registry runtimeTypeRegistry; @@ -52,7 +52,7 @@ public class PackageRegistryIndex { this.runtimeTypeRegistry = registry; this.packageFilter = packageFilter; indexTypesFromRegistry(false); - if (!Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false"))) { + if (!Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false"))) { //$NON-NLS-1$ //$NON-NLS-2$ indexTypesFromRegistry(true); } } @@ -96,7 +96,7 @@ public class PackageRegistryIndex { */ public Collection<EClass> getEClassesFromName(String name) { Collection<EClass> result = index.get(name); - if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false")) && result.isEmpty() && !initializedDescriptors) { + if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false")) && result.isEmpty() && !initializedDescriptors) { //$NON-NLS-1$ //$NON-NLS-2$ indexTypesFromRegistry(true); initializedDescriptors = true; result = index.get(name); diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java index d6634c86ce..4882095b2e 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionAuthorityRegistryImpl.java @@ -39,11 +39,7 @@ public class PermissionAuthorityRegistryImpl implements IPermissionAuthorityRegi public PermissionAuthorityRegistryImpl() { } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthorityRegistry#getPermissionAuthority(org.eclipse.emf.ecore.EObject) - */ + @Override public IPermissionAuthority getPermissionAuthority(final EObject modelElement) { IPermissionAuthority authority = null; // If element is a Resource (can happen when the given parameter is a @@ -69,11 +65,7 @@ public class PermissionAuthorityRegistryImpl implements IPermissionAuthorityRegi return authority; } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthorityRegistry#getPermissionAuthority(org.eclipse.emf.ecore.resource.ResourceSet) - */ + @Override public IPermissionAuthority getPermissionAuthority(final ResourceSet resourceSet) { if (!resourceSetToAuthority.containsKey(resourceSet)) { final IPermissionAuthority newAuth = PermissionService.createPermissionAuthority(resourceSet); @@ -83,11 +75,7 @@ public class PermissionAuthorityRegistryImpl implements IPermissionAuthorityRegi return resourceSetToAuthority.get(resourceSet); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthorityRegistry#getPermissionAuthority(org.eclipse.emf.ecore.resource.Resource) - */ + @Override public IPermissionAuthority getPermissionAuthority(final Resource res) { IPermissionAuthority result = null; if (res.getResourceSet() != null) { @@ -99,11 +87,7 @@ public class PermissionAuthorityRegistryImpl implements IPermissionAuthorityRegi return result; } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.ecore.extender.business.api.permission.IPermissionAuthorityRegistry#dispose() - */ + @Override public void dispose() { resourceSetToAuthority.clear(); } diff --git a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionService.java b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionService.java index 2048fa5e69..4527fe1f65 100644 --- a/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionService.java +++ b/plugins/org.eclipse.sirius.ecore.extender/src/org/eclipse/sirius/ecore/extender/business/internal/permission/PermissionService.java @@ -44,7 +44,7 @@ public final class PermissionService { private static final String EXTENDER_PROVIDER_EXTENSION_POINT = "org.eclipse.sirius.ecore.extender.PermissionProvider"; //$NON-NLS-1$ /** Externalized here to avoid too many distinct usages. */ - private static final String TAG_ENGINE = "permissionprovider"; + private static final String TAG_ENGINE = "permissionprovider"; //$NON-NLS-1$ private PermissionService() { @@ -138,7 +138,7 @@ public final class PermissionService { return null; } String id = configElement.getDeclaringExtension().getUniqueIdentifier(); - int priority = getPriorityValue(configElement.getAttribute("priority")); + int priority = getPriorityValue(configElement.getAttribute("priority")); //$NON-NLS-1$ PermissionProviderDescriptor permissionProviderDescriptor = new EclipsePermissionProviderDescriptor(id, priority, configElement); return permissionProviderDescriptor; } diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java index 9a3895a914..2471c34793 100644 --- a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java +++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/actions/OpenPropertiesWizardAction.java @@ -31,16 +31,12 @@ import org.eclipse.sirius.viewpoint.SiriusPlugin; * @author Goulwen Le Fur */ public class OpenPropertiesWizardAction extends AbstractExternalJavaAction { - /** - * {@inheritDoc} - */ + @Override public boolean canExecute(Collection<? extends EObject> selections) { return true; } - /** - * {@inheritDoc} - */ + @Override public void execute(Collection<? extends EObject> selections, Map<String, Object> parameters) { if (selections.size() > 0) { try { diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/EEFAdapterPlugin.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/EEFAdapterPlugin.java index 0c9f847401..7fdb31657b 100644 --- a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/EEFAdapterPlugin.java +++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/adapters/EEFAdapterPlugin.java @@ -24,7 +24,7 @@ public class EEFAdapterPlugin extends EMFPlugin { /** * The plug-in ID. */ - public static final String PLUGIN_ID = "org.eclipse.sirius.eef.adapters"; + public static final String PLUGIN_ID = "org.eclipse.sirius.eef.adapters"; //$NON-NLS-1$ /** * Keep track of the singleton. diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java index 9b9a8ad64f..044559fb56 100644 --- a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java +++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/section/SiriusFilteringSectionDescriptor.java @@ -45,7 +45,7 @@ import org.eclipse.ui.views.properties.tabbed.ITabDescriptor; @SuppressWarnings("restriction") public class SiriusFilteringSectionDescriptor implements ISectionDescriptorProvider, IExecutableExtension { - private static final String CONTRIBUTOR_ID = "contributorId"; + private static final String CONTRIBUTOR_ID = "contributorId"; //$NON-NLS-1$ /** The property contributor ID */ private String propertyContributorId; @@ -65,22 +65,22 @@ public class SiriusFilteringSectionDescriptor implements ISectionDescriptorProvi EEFAdapterPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, EEFAdapterPlugin.PLUGIN_ID, "The section filter must be associated to a property contributor id")); } else { // Filters loading - IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.sirius.eef.adapters.sectionFilters"); + IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.sirius.eef.adapters.sectionFilters"); //$NON-NLS-1$ List<String> sectionsToFilter = new ArrayList<String>(); for (IConfigurationElement cfgElement : point.getConfigurationElements()) { if (propertyContributorId.equals(cfgElement.getAttribute(SiriusFilteringSectionDescriptor.CONTRIBUTOR_ID))) { - for (IConfigurationElement sectionFilterCfgElement : cfgElement.getChildren("sectionFilter")) { - sectionsToFilter.add(sectionFilterCfgElement.getAttribute("id")); + for (IConfigurationElement sectionFilterCfgElement : cfgElement.getChildren("sectionFilter")) { //$NON-NLS-1$ + sectionsToFilter.add(sectionFilterCfgElement.getAttribute("id")); //$NON-NLS-1$ } } } // Property section configuration loading - point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.views.properties.tabbed.propertySections"); + point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.views.properties.tabbed.propertySections"); //$NON-NLS-1$ List<ISectionDescriptor> result = new ArrayList<ISectionDescriptor>(); for (IConfigurationElement cfgElement : point.getConfigurationElements()) { if (propertyContributorId.equals(cfgElement.getAttribute(SiriusFilteringSectionDescriptor.CONTRIBUTOR_ID))) { - for (IConfigurationElement propertySectionCfgElement : cfgElement.getChildren("propertySection")) { + for (IConfigurationElement propertySectionCfgElement : cfgElement.getChildren("propertySection")) { //$NON-NLS-1$ SectionDescriptor sectionDescritor = new SectionDescriptor(propertySectionCfgElement); // Section filtering if (!sectionsToFilter.contains(sectionDescritor.getId())) { @@ -132,15 +132,15 @@ class SectionDescriptor extends AbstractSectionDescriptor { protected SectionDescriptor(IConfigurationElement cfgElement) { super(); this.configurationElement = cfgElement; - id = cfgElement.getAttribute("id"); - targetTab = cfgElement.getAttribute("tab"); + id = cfgElement.getAttribute("id"); //$NON-NLS-1$ + targetTab = cfgElement.getAttribute("tab"); //$NON-NLS-1$ afterSection = cfgElement.getAttribute(afterSection); if (afterSection == null) { afterSection = ITabDescriptor.TOP; } - if (cfgElement.getAttribute("enablesFor") != null) { + if (cfgElement.getAttribute("enablesFor") != null) { //$NON-NLS-1$ try { - enablesFor = Integer.parseInt(cfgElement.getAttribute("enablesFor")); + enablesFor = Integer.parseInt(cfgElement.getAttribute("enablesFor")); //$NON-NLS-1$ if (enablesFor < 0) { enablesFor = ISectionDescriptor.ENABLES_FOR_ANY; } @@ -149,12 +149,12 @@ class SectionDescriptor extends AbstractSectionDescriptor { } } try { - if (cfgElement.getAttribute("filter") != null) { - filter = (IFilter) cfgElement.createExecutableExtension("filter"); + if (cfgElement.getAttribute("filter") != null) { //$NON-NLS-1$ + filter = (IFilter) cfgElement.createExecutableExtension("filter"); //$NON-NLS-1$ } - IConfigurationElement[] elements = cfgElement.getChildren("input"); + IConfigurationElement[] elements = cfgElement.getChildren("input"); //$NON-NLS-1$ for (IConfigurationElement element : elements) { - inputTypes.add(element.getAttribute("type")); + inputTypes.add(element.getAttribute("type")); //$NON-NLS-1$ } } catch (CoreException e) { EEFAdapterPlugin.getPlugin().getLog().log(e.getStatus()); @@ -180,7 +180,7 @@ class SectionDescriptor extends AbstractSectionDescriptor { public ISection getSectionClass() { ISection section = null; try { - section = (ISection) configurationElement.createExecutableExtension("class"); + section = (ISection) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$ } catch (CoreException exception) { EEFAdapterPlugin.getPlugin().getLog().log(exception.getStatus()); } diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/api/helper/TableUIHelper.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/api/helper/TableUIHelper.java index 1729b467ab..6d7c874afe 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/api/helper/TableUIHelper.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/api/helper/TableUIHelper.java @@ -61,7 +61,7 @@ public final class TableUIHelper { final List<List<String>> expected = new ArrayList<List<String>>(); if (!inverse) { final List<String> header = new ArrayList<String>(); - header.add(""); + header.add(""); //$NON-NLS-1$ for (final DColumn column : table.getColumns()) { if (column.isVisible()) { header.add(filler.getContent(column)); @@ -219,15 +219,15 @@ public final class TableUIHelper { } final StringBuffer result = new StringBuffer(); - result.append("<table>\n"); + result.append("<table>\n"); //$NON-NLS-1$ for (int i = 0; i < descriptor.size(); i++) { final List<String> line = descriptor.get(i); - result.append("<tr>"); + result.append("<tr>"); //$NON-NLS-1$ for (String column : line) { if (i == 0) { - result.append("<th>"); + result.append("<th>"); //$NON-NLS-1$ } else { - result.append("<td>"); + result.append("<td>"); //$NON-NLS-1$ } final StringBuffer textToAppend = new StringBuffer(); final int charsToAdd = columnMaxSize[line.indexOf(column)] - column.length(); @@ -237,15 +237,15 @@ public final class TableUIHelper { result.append(column); result.append(textToAppend); if (i == 0) { - result.append("</th>"); + result.append("</th>"); //$NON-NLS-1$ } else { - result.append("</td>"); + result.append("</td>"); //$NON-NLS-1$ } } - result.append("</tr>\n"); + result.append("</tr>\n"); //$NON-NLS-1$ } - result.append("</table>"); + result.append("</table>"); //$NON-NLS-1$ return result.toString(); } @@ -463,7 +463,7 @@ public final class TableUIHelper { * @author lredor */ class TableFiller { - protected static final String BLANK_MARKER = "_"; + protected static final String BLANK_MARKER = "_"; //$NON-NLS-1$ public String getContent(final DLine line) { return line.getLabel(); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/HierarchyLabelTableProvider.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/HierarchyLabelTableProvider.java index 36d6ff2aac..dd4a007e91 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/HierarchyLabelTableProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/HierarchyLabelTableProvider.java @@ -30,7 +30,7 @@ import org.eclipse.swt.graphics.Image; */ public class HierarchyLabelTableProvider extends LabelProvider { - private static final String DELIMITER = " > "; + private static final String DELIMITER = " > "; //$NON-NLS-1$ private ILabelProvider wrappedProvider; diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/TableDialectUI.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/TableDialectUI.java index 8ecaf01b72..db0386067e 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/TableDialectUI.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/business/internal/dialect/TableDialectUI.java @@ -28,7 +28,7 @@ public class TableDialectUI implements DialectUI { * @see org.eclipse.sirius.ui.business.api.dialect.DialectUI#getName() */ public String getName() { - return "table"; + return "table"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DColumnSorter.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DColumnSorter.java index 00d88e0b29..72ed5e7a01 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DColumnSorter.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DColumnSorter.java @@ -46,7 +46,7 @@ public class DColumnSorter extends DTableElementSorter<DColumn> { if (optionalCell.some()) { return optionalCell.get().getLabel(); } else { - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DLineSorter.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DLineSorter.java index 6d7023643d..fd28dbf62a 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DLineSorter.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/commands/DLineSorter.java @@ -42,7 +42,7 @@ public class DLineSorter extends DTableElementSorter<DLine> { * {@inheritDoc} */ protected String getSortLabel(final DLine line) { - String result = ""; + String result = ""; //$NON-NLS-1$ if (dColumn == null) { // The sorted column is the header result = line.getLabel(); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java index f8e9ed77b1..84f8b45ae9 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/AbstractDTableEditor.java @@ -91,10 +91,10 @@ import org.eclipse.ui.part.FileEditorInput; public abstract class AbstractDTableEditor extends AbstractDTreeEditor implements DTableEditor { /** The contributor ID */ - private static final String CONTRIBUTOR_ID = "org.eclipse.sirius.table.ui.EditorID"; + private static final String CONTRIBUTOR_ID = "org.eclipse.sirius.table.ui.EditorID"; //$NON-NLS-1$ /** the context ID. */ - private static final String CONTEXT_ID = CONTRIBUTOR_ID + ".tableContext"; + private static final String CONTEXT_ID = CONTRIBUTOR_ID + ".tableContext"; //$NON-NLS-1$ /** This DTable model */ private DTable tableModel; @@ -277,10 +277,10 @@ public abstract class AbstractDTableEditor extends AbstractDTreeEditor implement @Override public Image getFrozenRepresentationImage() { if (frozenRepresentationImage == null || frozenRepresentationImage.isDisposed()) { - Image refreshImage = TableUIPlugin.Implementation.getImage(TableUIPlugin.Implementation.getBundledImageDescriptor("icons/" + DTableViewerManager.REFRESH_IMG + ".gif")); + Image refreshImage = TableUIPlugin.Implementation.getImage(TableUIPlugin.Implementation.getBundledImageDescriptor("icons/" + DTableViewerManager.REFRESH_IMG + ".gif")); //$NON-NLS-1$ //$NON-NLS-2$ List<Object> images = new ArrayList<Object>(2); images.add(refreshImage); - Image lockByOtherOverlayIamge = SiriusEditPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); + Image lockByOtherOverlayIamge = SiriusEditPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); //$NON-NLS-1$ images.add(lockByOtherOverlayIamge); ImageDescriptor composedImageDescriptor = new ComposedImageDescriptor(new ComposedImage(images)); frozenRepresentationImage = SiriusEditPlugin.getPlugin().getImage(composedImageDescriptor); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableCrossEditor.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableCrossEditor.java index 31c6927869..7cce841651 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableCrossEditor.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableCrossEditor.java @@ -24,10 +24,10 @@ public class DTableCrossEditor extends AbstractDTableEditor { /** * The editor ID. */ - public static final String ID = "org.eclipse.sirius.table.ui.CrossTableEditorID"; + public static final String ID = "org.eclipse.sirius.table.ui.CrossTableEditorID"; //$NON-NLS-1$ /** Initial title image descriptor **/ - private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TableUIPlugin.Implementation.getBundledImageDescriptor("icons/full/obj16/CrossTableDescription.gif"); + private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TableUIPlugin.Implementation.getBundledImageDescriptor("icons/full/obj16/CrossTableDescription.gif"); //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEditionEditor.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEditionEditor.java index ba8518922b..6a852b7c86 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEditionEditor.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEditionEditor.java @@ -24,10 +24,10 @@ public class DTableEditionEditor extends AbstractDTableEditor { /** * The editor ID. */ - public static final String ID = "org.eclipse.sirius.table.ui.EditionTableEditorID"; + public static final String ID = "org.eclipse.sirius.table.ui.EditionTableEditorID"; //$NON-NLS-1$ /** Initial title image descriptor **/ - private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TableUIPlugin.Implementation.getBundledImageDescriptor("icons/full/obj16/EditionTableDescription.gif"); + private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TableUIPlugin.Implementation.getBundledImageDescriptor("icons/full/obj16/EditionTableDescription.gif"); //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEraseItemListener.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEraseItemListener.java index a948228cf4..86e16fe809 100755 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEraseItemListener.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableEraseItemListener.java @@ -30,7 +30,7 @@ import org.eclipse.ui.PlatformUI; * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a> */ public class DTableEraseItemListener implements Listener { - private static final boolean IS_WINDOWS_OS = "win32".equals(SWT.getPlatform()); + private static final boolean IS_WINDOWS_OS = "win32".equals(SWT.getPlatform()); //$NON-NLS-1$ private static final Color COLOR_LIST_SELECTED = PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_LIST_SELECTION); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java index fe2ae33d16..692be2d81b 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableMenuListener.java @@ -93,23 +93,23 @@ import com.google.common.collect.Lists; * */ public class DTableMenuListener implements IMenuListener { - private static final String MENU_OPEN_REPRESENTATION_ID = "popup.open"; + private static final String MENU_OPEN_REPRESENTATION_ID = "popup.open"; //$NON-NLS-1$ - private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; + private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; //$NON-NLS-1$ - private static final String MENU_HIDEREVEAL_ID = "popup.hidereveal"; + private static final String MENU_HIDEREVEAL_ID = "popup.hidereveal"; //$NON-NLS-1$ - private static final String MENU_EXPORT_ID = "popup.export"; + private static final String MENU_EXPORT_ID = "popup.export"; //$NON-NLS-1$ - private static final String NEW_REPRESENTATION_GROUP_SEPARATOR = "newRepresentation"; + private static final String NEW_REPRESENTATION_GROUP_SEPARATOR = "newRepresentation"; //$NON-NLS-1$ - private static final String EXISTING_REPRESENTATION_GROUP_SEPARATOR = "existingRepresentation"; + private static final String EXISTING_REPRESENTATION_GROUP_SEPARATOR = "existingRepresentation"; //$NON-NLS-1$ - private static final String VIEWPOINT_GROUP_SEPARATOR = "viewpoint"; + private static final String VIEWPOINT_GROUP_SEPARATOR = "viewpoint"; //$NON-NLS-1$ - private static final String PROPERTIES_SEPARATOR = "properties"; + private static final String PROPERTIES_SEPARATOR = "properties"; //$NON-NLS-1$ - private static final String HIDE_SEPARATOR = "hideGroup"; + private static final String HIDE_SEPARATOR = "hideGroup"; //$NON-NLS-1$ private final AdapterFactory adapterFactory; @@ -435,7 +435,7 @@ public class DTableMenuListener implements IMenuListener { menuItem.setVisible(true); manager.add(menuItem); exportMenuManager.add(new Separator(DTableMenuListener.VIEWPOINT_GROUP_SEPARATOR)); - final IAction action = new Action("CSV", DTableViewerManager.getImageRegistry().getDescriptor(DTableViewerManager.EXPORT_IMG)) { + final IAction action = new Action("CSV", DTableViewerManager.getImageRegistry().getDescriptor(DTableViewerManager.EXPORT_IMG)) { //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableViewerManager.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableViewerManager.java index 7508289016..1bda6a4a4f 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableViewerManager.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/DTableViewerManager.java @@ -101,42 +101,42 @@ import com.google.common.collect.Maps; public class DTableViewerManager extends AbstractDTableViewerManager { /** The key for the image which represents an export action. */ - public static final String EXPORT_IMG = "table/export"; + public static final String EXPORT_IMG = "table/export"; //$NON-NLS-1$ /** The key for the image which represents a hide action. */ - public static final String HIDE_IMG = "table/hide"; + public static final String HIDE_IMG = "table/hide"; //$NON-NLS-1$ /** The key for the image which represents a reveal action. */ - public static final String REVEAL_IMG = "table/reveal"; + public static final String REVEAL_IMG = "table/reveal"; //$NON-NLS-1$ /** The key for the image which represents a delete action. */ - public static final String DELETE_IMG = "table/delete"; + public static final String DELETE_IMG = "table/delete"; //$NON-NLS-1$ /** The key for the image which represents a createLine action. */ - public static final String CREATE_LINE = "table/newLine"; + public static final String CREATE_LINE = "table/newLine"; //$NON-NLS-1$ /** The key for the image which represents a createColumn action. */ - public static final String CREATE_COLUMN = "table/newColumn"; + public static final String CREATE_COLUMN = "table/newColumn"; //$NON-NLS-1$ /** The key for the image which represents a delete action. */ - public static final String REFRESH_IMG = "table/refresh"; + public static final String REFRESH_IMG = "table/refresh"; //$NON-NLS-1$ /** The key for the image which represents a delete action. */ - public static final String SHOW_PROPERTIES_VIEW = "table/prop_ps"; + public static final String SHOW_PROPERTIES_VIEW = "table/prop_ps"; //$NON-NLS-1$ /** The key for the image which represents a sortByLine action. */ - public static final String SORT_BY_LINE = "table/sortByLine"; + public static final String SORT_BY_LINE = "table/sortByLine"; //$NON-NLS-1$ /** The key for the image which represents a sortByColumn action. */ - public static final String SORT_BY_COLUMN = "table/sortByColumn"; + public static final String SORT_BY_COLUMN = "table/sortByColumn"; //$NON-NLS-1$ /** The key for the image which represents a hide/reveal action. */ - public static final String HIDE_REVEAL_IMG = "table/hideReveal"; + public static final String HIDE_REVEAL_IMG = "table/hideReveal"; //$NON-NLS-1$ /** * Use to store the semantic column in SWT column. */ - public static final String TABLE_COLUMN_DATA = "org.eclipse.sirius.table.ui.dTableColumn"; + public static final String TABLE_COLUMN_DATA = "org.eclipse.sirius.table.ui.dTableColumn"; //$NON-NLS-1$ // The imageRegistry for the action images private static ImageRegistry imageRegistry = new ImageRegistry(); @@ -283,7 +283,7 @@ public class DTableViewerManager extends AbstractDTableViewerManager { DslCommonPlugin.PROFILER.startWork(SiriusTasksKey.ADD_SWT_COLUMN_KEY); final TreeViewerColumn headerTreeColumn = new TreeViewerColumn(treeViewer, SWT.CENTER, 0); DslCommonPlugin.PROFILER.startWork(SiriusTasksKey.SET_COLUMN_NAME_KEY); - headerTreeColumn.getColumn().setText(""); + headerTreeColumn.getColumn().setText(""); //$NON-NLS-1$ DslCommonPlugin.PROFILER.stopWork(SiriusTasksKey.SET_COLUMN_NAME_KEY); ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/action/EditorCreateTargetColumnMenuAction.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/action/EditorCreateTargetColumnMenuAction.java index 0505b1d4ed..1a01f9f5c7 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/action/EditorCreateTargetColumnMenuAction.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/action/EditorCreateTargetColumnMenuAction.java @@ -25,7 +25,7 @@ import org.eclipse.sirius.table.ui.tools.internal.editor.DTableViewerManager; */ public class EditorCreateTargetColumnMenuAction extends AbstractEditorCreateMenuAction<CreateTargetColumnAction> { /** The Id of this action. */ - public static final String ID = "CreateTargetColumnMenu"; + public static final String ID = "CreateTargetColumnMenu"; //$NON-NLS-1$ /** * This default constructor will instantiate an action given the diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PaperClipsPrintHelper.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PaperClipsPrintHelper.java index f6ce88318e..6463b0b241 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PaperClipsPrintHelper.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PaperClipsPrintHelper.java @@ -94,12 +94,12 @@ public class PaperClipsPrintHelper implements PrintHelper { */ grid.addColumn(new GridColumn(col.getAlignment(), SWT.DEFAULT, 0)); - final Print cell = createCell("", col.getImage(), col.getText(), SWT.CENTER); + final Print cell = createCell("", col.getImage(), col.getText(), SWT.CENTER); //$NON-NLS-1$ grid.addHeader(cell); } /* Add content rows */ - createTreeItemRows("", grid, tree.getItems(), columns); + createTreeItemRows("", grid, tree.getItems(), columns); //$NON-NLS-1$ return new ScalePrint(grid); } @@ -124,7 +124,7 @@ public class PaperClipsPrintHelper implements PrintHelper { for (int i = 0; i < columns.length; i++) { grid.add(createCell(offset, item.getImage(i), item.getText(i), columns[i].getAlignment())); } - final String newOffset = offset + " "; + final String newOffset = offset + " "; //$NON-NLS-1$ createTreeItemRows(newOffset, grid, item.getItems(), columns); } @@ -133,7 +133,7 @@ public class PaperClipsPrintHelper implements PrintHelper { return new TextPrint(text, align); } - final GridPrint grid = new GridPrint("p, p, d"); + final GridPrint grid = new GridPrint("p, p, d"); //$NON-NLS-1$ grid.add(new TextPrint(offset)); grid.add(new ImagePrint(image.getImageData(), image.getDevice().getDPI())); grid.add(new TextPrint(text, align)); @@ -141,7 +141,7 @@ public class PaperClipsPrintHelper implements PrintHelper { } private PageDecoration getHeader(final String name) { - final GridPrint headerGrid = new GridPrint("d:g"); + final GridPrint headerGrid = new GridPrint("d:g"); //$NON-NLS-1$ headerGrid.add(new TextPrint(name)); headerGrid.add(new LinePrint(SWT.HORIZONTAL), GridPrint.REMAINDER); return new SimplePageDecoration(headerGrid); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PrintAsImageCallback.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PrintAsImageCallback.java index c99ca69298..3187c4bc70 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PrintAsImageCallback.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/print/PrintAsImageCallback.java @@ -233,7 +233,7 @@ public class PrintAsImageCallback implements PrintCallback { final Rectangle trim = printParameters.getTrim(); gc.drawLine(-trim.x, maxPageHeight + headerMargin + 1, maxPageWidth, maxPageHeight + headerMargin + 1); - gc.drawText("page " + page + "/" + numberOfPages(), -trim.x, maxPageHeight + headerMargin + 5); + gc.drawText("page " + page + "/" + numberOfPages(), -trim.x, maxPageHeight + headerMargin + 5); //$NON-NLS-2$ } }); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DFeatureColumnEditingSupport.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DFeatureColumnEditingSupport.java index f3fda276a7..175dc47566 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DFeatureColumnEditingSupport.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DFeatureColumnEditingSupport.java @@ -216,7 +216,7 @@ public class DFeatureColumnEditingSupport extends EditingSupport { result = result.toString(); } } else { - result = ""; + result = ""; //$NON-NLS-1$ } } } catch (final FeatureNotFoundException e) { @@ -256,7 +256,7 @@ public class DFeatureColumnEditingSupport extends EditingSupport { try { if (eClassifier instanceof EDataType) { tempValue = eClassifier.getEPackage().getEFactoryInstance().createFromString((EDataType) eClassifier, (String) value); - } else if ("UnlimitedNatural".equals(eClassifier.getName())) { + } else if ("UnlimitedNatural".equals(eClassifier.getName())) { //$NON-NLS-1$ tempValue = Integer.valueOf((String) value); } } catch (final NumberFormatException e) { @@ -367,7 +367,7 @@ public class DFeatureColumnEditingSupport extends EditingSupport { } } else { if (eClassifier != null) { - if (eClassifier instanceof EDataType && ("Boolean".equals(((EDataType) eClassifier).getName()) || "EBoolean".equals(((EDataType) eClassifier).getName()))) { + if (eClassifier instanceof EDataType && ("Boolean".equals(((EDataType) eClassifier).getName()) || "EBoolean".equals(((EDataType) eClassifier).getName()))) { //$NON-NLS-1$ //$NON-NLS-2$ result = new CheckboxCellEditor(tree); } else if (eClassifier instanceof EEnum) { final Object genericFeature = iItemPropertyDescriptor.getFeature(element); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableActionBarContributor.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableActionBarContributor.java index 8977f54a9c..ae590e55a4 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableActionBarContributor.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableActionBarContributor.java @@ -37,7 +37,7 @@ import org.eclipse.sirius.ui.tools.internal.editor.AbstractDTableViewerManager; public class DTableActionBarContributor extends EditingDomainActionBarContributor { /* ISharedImages.IMG_ETOOL_PRINT_EDIT only since 3.4 */ - private static final String IMG_ETOOL_PRINT_EDIT = "IMG_ETOOL_PRINT_EDIT"; + private static final String IMG_ETOOL_PRINT_EDIT = "IMG_ETOOL_PRINT_EDIT"; //$NON-NLS-1$ private PrintAction printAction; diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnHeaderLabelProvider.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnHeaderLabelProvider.java index 6a5a2812b0..63948c2bcb 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnHeaderLabelProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnHeaderLabelProvider.java @@ -45,7 +45,7 @@ public class DTableColumnHeaderLabelProvider extends DSemanticTargetBasedLabelPr */ @Override public String getText(final Object element) { - String text = ""; + String text = ""; //$NON-NLS-1$ if (element instanceof DColumn) { DColumn dColumn = (DColumn) element; text = dColumn.getLabel(); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnLabelProvider.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnLabelProvider.java index 391c77ada9..19a0ccb8b2 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnLabelProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableColumnLabelProvider.java @@ -46,10 +46,10 @@ import org.eclipse.swt.graphics.Image; */ public class DTableColumnLabelProvider extends ColumnLabelProvider implements IStyledLabelProvider { /** The key for the image which represents a checkbox checked. */ - public static final String CHECKED_IMAGE = "table/checked"; + public static final String CHECKED_IMAGE = "table/checked"; //$NON-NLS-1$ /** The key for the image which represents a checkbox unchecked. */ - public static final String UNCHECKED_IMAGE = "table/unchecked"; + public static final String UNCHECKED_IMAGE = "table/unchecked"; //$NON-NLS-1$ // The imageRegistry for the checkbox images private static ImageRegistry imageRegistry = new ImageRegistry(); @@ -174,7 +174,7 @@ public class DTableColumnLabelProvider extends ColumnLabelProvider implements IS line = (DLine) element; } final EClassifier eClassifier = TableHelper.getEClassifier(line, column); - if (eClassifier instanceof EDataType && ("Boolean".equals(((EDataType) eClassifier).getName()) || "EBoolean".equals(((EDataType) eClassifier).getName()))) { + if (eClassifier instanceof EDataType && ("Boolean".equals(((EDataType) eClassifier).getName()) || "EBoolean".equals(((EDataType) eClassifier).getName()))) { //$NON-NLS-1$ //$NON-NLS-2$ Option<DCell> optionalCell = TableHelper.getCell(line, column); if (optionalCell.some()) { return getImage(Boolean.parseBoolean(optionalCell.get().getLabel())); @@ -243,7 +243,7 @@ public class DTableColumnLabelProvider extends ColumnLabelProvider implements IS String text = getText(element); DefaultFontStyler styler = new DefaultFontStyler(getFont(element), getForeground(element), getBackground(element), getUnderline(element), getStrikeout(element)); if (text == null) { - text = ""; + text = ""; //$NON-NLS-1$ } StyledString styledString = new StyledString(text, styler); diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableLineLabelProvider.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableLineLabelProvider.java index f2223898f9..b752a6454c 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableLineLabelProvider.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTableLineLabelProvider.java @@ -49,7 +49,7 @@ public class DTableLineLabelProvider extends DSemanticTargetBasedLabelProvider i final DLine line = (DLine) element; return line.getLabel(); } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTargetColumnEditingSupport.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTargetColumnEditingSupport.java index dc0e8e6aca..d7c7a2b259 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTargetColumnEditingSupport.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/DTargetColumnEditingSupport.java @@ -108,7 +108,7 @@ public class DTargetColumnEditingSupport extends EditingSupport { result = optionalEditedCell.get().getLabel(); } if (result == null) { - result = ""; + result = ""; //$NON-NLS-1$ } } return result; diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/TableUIUpdaterRunnable.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/TableUIUpdaterRunnable.java index 728320e9ac..f37b94a2a1 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/TableUIUpdaterRunnable.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/editor/provider/TableUIUpdaterRunnable.java @@ -269,7 +269,7 @@ public class TableUIUpdaterRunnable implements Runnable { private void handleColumn(final TreeColumn treeColumn, boolean visible) { if (visible) { // Show column - final Integer restoredWith = (Integer) treeColumn.getData("restoredWidth"); + final Integer restoredWith = (Integer) treeColumn.getData("restoredWidth"); //$NON-NLS-1$ if (restoredWith != null) { treeColumn.setWidth(restoredWith.intValue()); ((TreeColumnLayout) treeColumn.getParent().getParent().getLayout()).setColumnData(treeColumn, new ColumnPixelData(restoredWith.intValue())); @@ -279,7 +279,7 @@ public class TableUIUpdaterRunnable implements Runnable { } } else { // Hide column - treeColumn.setData("restoredWidth", Integer.valueOf(treeColumn.getWidth())); + treeColumn.setData("restoredWidth", Integer.valueOf(treeColumn.getWidth())); //$NON-NLS-1$ treeColumn.setWidth(0); ((TreeColumnLayout) treeColumn.getParent().getParent().getLayout()).setColumnData(treeColumn, new ColumnPixelData(0)); } diff --git a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/propertysource/StyleCompositeEObjectpropertySource.java b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/propertysource/StyleCompositeEObjectpropertySource.java index 141ee96897..77c6d38c13 100644 --- a/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/propertysource/StyleCompositeEObjectpropertySource.java +++ b/plugins/org.eclipse.sirius.table.ui/src/org/eclipse/sirius/table/ui/tools/internal/properties/propertysource/StyleCompositeEObjectpropertySource.java @@ -45,7 +45,7 @@ public class StyleCompositeEObjectpropertySource extends TableCompositeEObjectPr if (getCategoryNames().containsKey(eObject)) { getCategoryNames().remove(eObject); } - result += " (" + eObject.eContainingFeature().getName() + ")"; + result += " (" + eObject.eContainingFeature().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ getCategoryNames().put(eObject, result); } return result; diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/color/DefaultColorStyleDescription.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/color/DefaultColorStyleDescription.java index 1e498cbafd..7b349d291d 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/color/DefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/color/DefaultColorStyleDescription.java @@ -25,9 +25,9 @@ import org.eclipse.sirius.tools.api.ui.color.EnvironmentSystemColorFactory; */ public class DefaultColorStyleDescription extends DescriptionSwitch<EObject> { - private static final String BLACK = "black"; + private static final String BLACK = "black"; //$NON-NLS-1$ - private static final String WHITE = "white"; + private static final String WHITE = "white"; //$NON-NLS-1$ /** * Set the default color descriptions on the given EObject. diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/ContributionTrakingIdentifier.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/ContributionTrakingIdentifier.java index e3f681c9dd..fdb04649e3 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/ContributionTrakingIdentifier.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/ContributionTrakingIdentifier.java @@ -60,7 +60,7 @@ public class ContributionTrakingIdentifier implements Function<EObject, Object> ContributionPoint cp = findMostSpecificContributionPoint(from, edSupplier.get(), cpSupplier.get()); if (cp != null) { String parentURI = pathFunction.apply(cp.getContributed()); - String relativeURI = currentURI.replace(parentURI, ""); + String relativeURI = currentURI.replace(parentURI, ""); //$NON-NLS-1$ return cp.getOrigin() + relativeURI; } else { throw new RuntimeException("Internal error: contributed element has no matching contribution data."); diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableDialect.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableDialect.java index 1fe194c001..17eaeee250 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableDialect.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableDialect.java @@ -27,7 +27,7 @@ public class TableDialect implements Dialect { * @see org.eclipse.sirius.business.api.dialect.Dialect#getName() */ public String getName() { - return "table"; + return "table"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableModelContributor.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableModelContributor.java index 6339ae5cd1..1062abb48a 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableModelContributor.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/dialect/TableModelContributor.java @@ -98,7 +98,7 @@ public final class TableModelContributor extends IncrementalModelContributor { } private boolean isReuseReference(EReference re) { - return !re.isContainment() && re.getName().startsWith("reused"); + return !re.isContainment() && re.getName().startsWith("reused"); //$NON-NLS-1$ } private void removeContributions(EObject obj) { diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/metamodel/TableToolVariables.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/metamodel/TableToolVariables.java index 7952f5d29c..7e6b96034c 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/metamodel/TableToolVariables.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/metamodel/TableToolVariables.java @@ -90,10 +90,10 @@ public class TableToolVariables extends DescriptionSwitch<Object> { @Override public Object caseTableCreationDescription(final TableCreationDescription object) { final ContainerViewVariable containerViewVariable = ToolFactory.eINSTANCE.createContainerViewVariable(); - containerViewVariable.setName("containerView"); + containerViewVariable.setName("containerView"); //$NON-NLS-1$ object.setContainerViewVariable(containerViewVariable); final NameVariable tableNameVariable = ToolFactory.eINSTANCE.createNameVariable(); - tableNameVariable.setName("tableName"); + tableNameVariable.setName("tableName"); //$NON-NLS-1$ object.setRepresentationNameVariable(tableNameVariable); final InitialOperation initialOperation = ToolFactory.eINSTANCE.createInitialOperation(); object.setInitialOperation(initialOperation); @@ -109,13 +109,13 @@ public class TableToolVariables extends DescriptionSwitch<Object> { @Override public Object caseTableNavigationDescription(final TableNavigationDescription object) { final ContainerViewVariable containerViewVariable = ToolFactory.eINSTANCE.createContainerViewVariable(); - containerViewVariable.setName("containerView"); + containerViewVariable.setName("containerView"); //$NON-NLS-1$ object.setContainerViewVariable(containerViewVariable); final ElementSelectVariable containerVariable = ToolFactory.eINSTANCE.createElementSelectVariable(); - containerVariable.setName("container"); + containerVariable.setName("container"); //$NON-NLS-1$ object.setContainerVariable(containerVariable); final NameVariable tableNameVariable = ToolFactory.eINSTANCE.createNameVariable(); - tableNameVariable.setName("tableName"); + tableNameVariable.setName("tableName"); //$NON-NLS-1$ object.setRepresentationNameVariable(tableNameVariable); return super.caseTableNavigationDescription(object); } diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java index b8b8319eb8..d7425c7974 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java @@ -42,12 +42,12 @@ public class InitializeCreationToolElementsToSelectExpressionParticipant extends /** * The Sirius version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("10.1.0.201507271600"); + public static final Version MIGRATION_VERSION = new Version("10.1.0.201507271600"); //$NON-NLS-1$ /** * Expression used to initialize expression. */ - public static final String ELEMENTS_TO_SELECT_EXPRESSION = "service:stdEmptyCollection"; + public static final String ELEMENTS_TO_SELECT_EXPRESSION = "service:stdEmptyCollection"; //$NON-NLS-1$ private static final String JAVA_EXTENSION_QUALIFIED_NAME = StandardServices.class.getName(); diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DCellCandidate.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DCellCandidate.java index 66ecd54a64..bb36329a9d 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DCellCandidate.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DCellCandidate.java @@ -116,7 +116,7 @@ public class DCellCandidate { parts[1] = (semantic == null) ? 0 : getSemanticID(); parts[2] = (line == null) ? 0 : getLineID(); parts[3] = (column == null) ? 0 : getColumnID(); - final String sep = "/"; + final String sep = "/"; //$NON-NLS-1$ return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1] + sep + parts[2] + sep + parts[3]); } diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java index f7bc33667b..2db2dbffae 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DFeatureColumnCandidate.java @@ -104,8 +104,8 @@ public class DFeatureColumnCandidate { private int computeHashCode() { final int[] parts = new int[2]; parts[0] = (mapping == null) ? 0 : getMappingID(); - parts[1] = Objects.firstNonNull(featureName, "").hashCode(); - final String sep = "/"; + parts[1] = Objects.firstNonNull(featureName, "").hashCode(); //$NON-NLS-1$ + final String sep = "/"; //$NON-NLS-1$ return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1]); } diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DLineCandidate.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DLineCandidate.java index fb9a47382d..2e7ddb6340 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DLineCandidate.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DLineCandidate.java @@ -107,7 +107,7 @@ public class DLineCandidate { parts[0] = (mapping == null) ? 0 : getMappingID(); parts[1] = (semantic == null) ? 0 : getSemanticID(); parts[2] = (viewContainer == null) ? 0 : getViewContainerID(); - final String sep = "/"; + final String sep = "/"; //$NON-NLS-1$ return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1] + sep + parts[2]); } diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java index 33651bc433..355cb76551 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java @@ -87,7 +87,7 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl * '*' as feature name allows to skip the feature name validation for cell * creation. */ - protected static final String SKIP_FEATURENAME_VALIDATION = "*"; + protected static final String SKIP_FEATURENAME_VALIDATION = "*"; //$NON-NLS-1$ private final ModelAccessor accessor; @@ -482,7 +482,7 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl if (!StringUtil.isEmpty(featureName)) { cellNeeded = setLabelWithFeatureValue(cell, columnMapping, featureName); } else { - cell.setLabel(""); + cell.setLabel(""); //$NON-NLS-1$ } } } else { @@ -498,7 +498,7 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl private boolean setLabelWithFeatureValue(final DCell cell, final ColumnMapping columnMapping, final String featureName) { boolean init = false; - String label = ""; + String label = ""; //$NON-NLS-1$ try { final Object featureObject = accessor.eGet(cell.getTarget(), featureName); if (featureObject != null) { diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTargetColumnCandidate.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTargetColumnCandidate.java index ec9c943664..840fd817bf 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTargetColumnCandidate.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTargetColumnCandidate.java @@ -104,7 +104,7 @@ public class DTargetColumnCandidate { final int[] parts = new int[2]; parts[0] = (mapping == null) ? 0 : getMappingID(); parts[1] = (semantic == null) ? 0 : getSemanticID(); - final String sep = "/"; + final String sep = "/"; //$NON-NLS-1$ return KeyCache.DEFAULT.getKey(parts[0] + sep + parts[1]); } diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/StyleWithDefaultStatus.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/StyleWithDefaultStatus.java index bbe396803c..1e1488376f 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/StyleWithDefaultStatus.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/StyleWithDefaultStatus.java @@ -89,7 +89,7 @@ public class StyleWithDefaultStatus { */ @Override public String toString() { - return style.toString() + "--> isDefault=" + isDefaultStyle(); + return style.toString() + "--> isDefault=" + isDefaultStyle(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/api/interpreter/IInterpreterSiriusTableVariables.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/api/interpreter/IInterpreterSiriusTableVariables.java index 0826c6275e..9232d2ef1f 100644 --- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/api/interpreter/IInterpreterSiriusTableVariables.java +++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/tools/api/interpreter/IInterpreterSiriusTableVariables.java @@ -22,20 +22,20 @@ public interface IInterpreterSiriusTableVariables extends IInterpreterSiriusVari /** * the line element. */ - String LINE = "line"; + String LINE = "line"; //$NON-NLS-1$ /** * The column element. */ - String COLUMN = "column"; + String COLUMN = "column"; //$NON-NLS-1$ /** * the line semantic element. */ - String LINE_SEMANTIC = "lineSemantic"; + String LINE_SEMANTIC = "lineSemantic"; //$NON-NLS-1$ /** * The column semantic element. */ - String COLUMN_SEMANTIC = "columnSemantic"; + String COLUMN_SEMANTIC = "columnSemantic"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/api/helper/TreeUIHelper.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/api/helper/TreeUIHelper.java index beefbeeb39..b30c5fbae6 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/api/helper/TreeUIHelper.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/api/helper/TreeUIHelper.java @@ -120,16 +120,16 @@ public final class TreeUIHelper { */ public static String toHTML(final List<String> descriptor) { final StringBuffer result = new StringBuffer(); - result.append("<table>\n"); + result.append("<table>\n"); //$NON-NLS-1$ for (String line : descriptor) { - result.append("<tr>"); - result.append("<td>"); + result.append("<tr>"); //$NON-NLS-1$ + result.append("<td>"); //$NON-NLS-1$ result.append(line); - result.append("</td>"); - result.append("</tr>\n"); + result.append("</td>"); //$NON-NLS-1$ + result.append("</tr>\n"); //$NON-NLS-1$ } - result.append("</table>"); + result.append("</table>"); //$NON-NLS-1$ return result.toString(); } diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java index c428156944..6857aaef58 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/HierarchyLabelTreeProvider.java @@ -29,7 +29,7 @@ import org.eclipse.swt.graphics.Image; */ public class HierarchyLabelTreeProvider extends LabelProvider { - private static final String DELIMITER = " > "; + private static final String DELIMITER = " > "; //$NON-NLS-1$ private ILabelProvider wrappedProvider; diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUI.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUI.java index e9a2851571..47d4cc0837 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUI.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/business/internal/dialect/TreeDialectUI.java @@ -23,7 +23,7 @@ public class TreeDialectUI implements DialectUI { * {@inheritDoc} */ public String getName() { - return "tree"; + return "tree"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java index 03e7e5cf8d..471c67fbd8 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeEditor.java @@ -81,13 +81,13 @@ public class DTreeEditor extends AbstractDTreeEditor implements org.eclipse.siri /** * The DTreeEditor ID. */ - public static final String ID = "org.eclipse.sirius.tree.ui.EditorID"; + public static final String ID = "org.eclipse.sirius.tree.ui.EditorID"; //$NON-NLS-1$ /** The context ID. */ - private static final String CONTEXT_ID = ID + ".treeContext"; + private static final String CONTEXT_ID = ID + ".treeContext"; //$NON-NLS-1$ /** Initial title image descriptor **/ - private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TreeUIPlugin.getBundledImageDescriptor("icons/full/obj16/TreeDescription.gif"); + private static final ImageDescriptor INITIAL_TITLE_IMAGE_DESCRIPTOR = TreeUIPlugin.getBundledImageDescriptor("icons/full/obj16/TreeDescription.gif"); //$NON-NLS-1$ /** This DTree model */ private DTree treeModel; @@ -237,10 +237,10 @@ public class DTreeEditor extends AbstractDTreeEditor implements org.eclipse.siri @Override public Image getFrozenRepresentationImage() { if (frozenRepresentationImage == null || frozenRepresentationImage.isDisposed()) { - Image refreshImage = TreeUIPlugin.getImage(TreeUIPlugin.getBundledImageDescriptor("icons/" + DTreeViewerManager.REFRESH_IMG + ".gif")); + Image refreshImage = TreeUIPlugin.getImage(TreeUIPlugin.getBundledImageDescriptor("icons/" + DTreeViewerManager.REFRESH_IMG + ".gif")); //$NON-NLS-1$ //$NON-NLS-2$ List<Object> images = new ArrayList<Object>(2); images.add(refreshImage); - Image lockByOtherOverlayImage = SiriusEditPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); + Image lockByOtherOverlayImage = SiriusEditPlugin.getPlugin().getImage(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied_overlay.gif")); //$NON-NLS-1$ images.add(lockByOtherOverlayImage); ImageDescriptor composedImageDescriptor = new ComposedImageDescriptor(new ComposedImage(images)); frozenRepresentationImage = SiriusEditPlugin.getPlugin().getImage(composedImageDescriptor); diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java index ccbcba2969..4511df4c6a 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeMenuListener.java @@ -69,17 +69,17 @@ import org.eclipse.ui.IWorkbenchActionConstants; */ public class DTreeMenuListener implements IMenuListener { - private static final String MENU_OPEN_REPRESENTATION_ID = "popup.navigate"; + private static final String MENU_OPEN_REPRESENTATION_ID = "popup.navigate"; //$NON-NLS-1$ - private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; + private static final String MENU_NEW_REPRESENTATION_ID = "popup.new"; //$NON-NLS-1$ - private static final String NEW_REPRESENTATION_GROUP_SEPARATOR = "newRepresentation"; + private static final String NEW_REPRESENTATION_GROUP_SEPARATOR = "newRepresentation"; //$NON-NLS-1$ - private static final String EXISTING_REPRESENTATION_GROUP_SEPARATOR = "existingRepresentation"; + private static final String EXISTING_REPRESENTATION_GROUP_SEPARATOR = "existingRepresentation"; //$NON-NLS-1$ - private static final String PROPERTIES_SEPARATOR = "properties"; + private static final String PROPERTIES_SEPARATOR = "properties"; //$NON-NLS-1$ - private static final String LOCK_SEPARATOR = "lockGroup"; + private static final String LOCK_SEPARATOR = "lockGroup"; //$NON-NLS-1$ private final AdapterFactory adapterFactory; diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeViewerManager.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeViewerManager.java index d7efc58275..eef3102c37 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeViewerManager.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/DTreeViewerManager.java @@ -90,13 +90,13 @@ import com.google.common.collect.Lists; public class DTreeViewerManager extends AbstractDTableViewerManager { /** The key for the image which represents a delete action. */ - public static final String REFRESH_IMG = "tree/refresh"; + public static final String REFRESH_IMG = "tree/refresh"; //$NON-NLS-1$ /** The key for the image which represents a delete action. */ - public static final String DELETE_IMG = "tree/delete"; + public static final String DELETE_IMG = "tree/delete"; //$NON-NLS-1$ /** The key for the image which represents a delete action. */ - public static final String CREATE_TREE_ITEM_IMG = "tree/newTreeItem"; + public static final String CREATE_TREE_ITEM_IMG = "tree/newTreeItem"; //$NON-NLS-1$ static { imageRegistry.put(REFRESH_IMG, ImageDescriptor.createFromURL((URL) TreeUIPlugin.INSTANCE.getImage(REFRESH_IMG))); @@ -277,7 +277,7 @@ public class DTreeViewerManager extends AbstractDTableViewerManager { Class<?> columnViewerClass = ColumnViewer.class; Method method; try { - method = columnViewerClass.getDeclaredMethod("getViewerColumn", Integer.TYPE); + method = columnViewerClass.getDeclaredMethod("getViewerColumn", Integer.TYPE); //$NON-NLS-1$ method.setAccessible(true); Object invoke = method.invoke(treeViewer, 0); if (invoke instanceof ViewerColumn) { diff --git a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java index efd9ca6466..f5b215ee3b 100644 --- a/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java +++ b/plugins/org.eclipse.sirius.tree.ui/src/org/eclipse/sirius/tree/ui/tools/internal/editor/provider/DTreeItemLabelProvider.java @@ -150,7 +150,7 @@ public class DTreeItemLabelProvider extends DSemanticTargetBasedLabelProvider im String text = getText(element); DefaultFontStyler styler = new DefaultFontStyler(getFont(element), getForeground(element), getBackground(element), getUnderline(element), getStrikeout(element)); if (text == null) { - text = ""; + text = ""; //$NON-NLS-1$ } StyledString styledString = new StyledString(text, styler); diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/color/DefaultColorStyleDescription.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/color/DefaultColorStyleDescription.java index 3a5ac2b8f8..25ceccd8cd 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/color/DefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/color/DefaultColorStyleDescription.java @@ -24,9 +24,9 @@ import org.eclipse.sirius.viewpoint.description.style.LabelStyleDescription; */ public class DefaultColorStyleDescription extends DescriptionSwitch<EObject> { - private static final String BLACK = "black"; + private static final String BLACK = "black"; //$NON-NLS-1$ - private static final String WHITE = "white"; + private static final String WHITE = "white"; //$NON-NLS-1$ /** * Set the default color descriptions on the given EObject. diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeDialect.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeDialect.java index 209eb95723..b51e8293bf 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeDialect.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/TreeDialect.java @@ -25,7 +25,7 @@ public class TreeDialect implements Dialect { * {@inheritDoc} */ public String getName() { - return "tree"; + return "tree"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeItemMappingExpression.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeItemMappingExpression.java index edecd3458c..d7f5d7db1a 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeItemMappingExpression.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/tree/TreeItemMappingExpression.java @@ -30,7 +30,7 @@ import org.eclipse.sirius.viewpoint.SiriusPlugin; */ public class TreeItemMappingExpression { - private static final String TREE = "tree"; + private static final String TREE = "tree"; //$NON-NLS-1$ private GlobalContext ctx; diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/viewpoint/MappingBasedPartition.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/viewpoint/MappingBasedPartition.java index 07ad59c06d..ca1459fef4 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/viewpoint/MappingBasedPartition.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/dialect/common/viewpoint/MappingBasedPartition.java @@ -39,7 +39,7 @@ import com.google.common.collect.Lists; */ public class MappingBasedPartition implements SemanticPartition { - private static final String TREE = "tree"; + private static final String TREE = "tree"; //$NON-NLS-1$ private String domainClass; diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/metamodel/TreeToolVariables.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/metamodel/TreeToolVariables.java index ff449f66eb..4aa22ecc6e 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/metamodel/TreeToolVariables.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/metamodel/TreeToolVariables.java @@ -138,10 +138,10 @@ public class TreeToolVariables extends DescriptionSwitch<Object> { @Override public Object caseTreeCreationDescription(final TreeCreationDescription object) { final ContainerViewVariable containerViewVariable = ToolFactory.eINSTANCE.createContainerViewVariable(); - containerViewVariable.setName("containerView"); + containerViewVariable.setName("containerView"); //$NON-NLS-1$ object.setContainerViewVariable(containerViewVariable); final NameVariable treeNameVariable = ToolFactory.eINSTANCE.createNameVariable(); - treeNameVariable.setName("treeName"); + treeNameVariable.setName("treeName"); //$NON-NLS-1$ object.setRepresentationNameVariable(treeNameVariable); final InitialOperation initialOperation = ToolFactory.eINSTANCE.createInitialOperation(); object.setInitialOperation(initialOperation); @@ -157,13 +157,13 @@ public class TreeToolVariables extends DescriptionSwitch<Object> { @Override public Object caseTreeNavigationDescription(final TreeNavigationDescription object) { final ContainerViewVariable containerViewVariable = ToolFactory.eINSTANCE.createContainerViewVariable(); - containerViewVariable.setName("containerView"); + containerViewVariable.setName("containerView"); //$NON-NLS-1$ object.setContainerViewVariable(containerViewVariable); final ElementSelectVariable containerVariable = ToolFactory.eINSTANCE.createElementSelectVariable(); - containerVariable.setName("container"); + containerVariable.setName("container"); //$NON-NLS-1$ object.setContainerVariable(containerVariable); final NameVariable treeNameVariable = ToolFactory.eINSTANCE.createNameVariable(); - treeNameVariable.setName("treeName"); + treeNameVariable.setName("treeName"); //$NON-NLS-1$ object.setRepresentationNameVariable(treeNameVariable); return super.caseTreeNavigationDescription(object); } diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java index 82c764c073..3c8a40032a 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/business/internal/migration/description/InitializeCreationToolElementsToSelectExpressionParticipant.java @@ -48,12 +48,12 @@ public class InitializeCreationToolElementsToSelectExpressionParticipant extends /** * The Sirius version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("10.1.0.201507271600"); + public static final Version MIGRATION_VERSION = new Version("10.1.0.201507271600"); //$NON-NLS-1$ /** * Expression used to initialize expression. */ - public static final String ELEMENTS_TO_SELECT_EXPRESSION = "service:stdEmptyCollection"; + public static final String ELEMENTS_TO_SELECT_EXPRESSION = "service:stdEmptyCollection"; //$NON-NLS-1$ private static final String JAVA_EXTENSION_QUALIFIED_NAME = StandardServices.class.getName(); diff --git a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/api/interpreter/IInterpreterSiriusTreeVariables.java b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/api/interpreter/IInterpreterSiriusTreeVariables.java index 18910971e1..0eb9617dcc 100644 --- a/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/api/interpreter/IInterpreterSiriusTreeVariables.java +++ b/plugins/org.eclipse.sirius.tree/src/org/eclipse/sirius/tree/tools/api/interpreter/IInterpreterSiriusTreeVariables.java @@ -20,21 +20,21 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariabl public interface IInterpreterSiriusTreeVariables extends IInterpreterSiriusVariables { /** "diagram". */ - String TREE = "tree"; + String TREE = "tree"; //$NON-NLS-1$ /** * the tree item element. */ - String TREE_ITEM = "treeitem"; + String TREE_ITEM = "treeitem"; //$NON-NLS-1$ /** * the line semantic element. */ - String TREE_ITEM_SEMANTIC = "treeitemSemantic"; + String TREE_ITEM_SEMANTIC = "treeitemSemantic"; //$NON-NLS-1$ /** * The preceding siblings in a Drag and Drop operation. */ - String PRECEDING_SIBLINGS = "precedingSiblings"; + String PRECEDING_SIBLINGS = "precedingSiblings"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/action/OpenHelpSectionAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/action/OpenHelpSectionAction.java index 7247eb6723..218100415e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/action/OpenHelpSectionAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/action/OpenHelpSectionAction.java @@ -40,7 +40,7 @@ public class OpenHelpSectionAction extends AbstractExternalJavaAction { * {@inheritDoc} */ public void execute(Collection<? extends EObject> selections, Map<String, Object> parameters) { - String href = getParameter(parameters, "href", String.class); + String href = getParameter(parameters, "href", String.class); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(href); } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/DialectUIManager.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/DialectUIManager.java index ebf184156a..bbb649bf44 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/DialectUIManager.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/DialectUIManager.java @@ -28,12 +28,12 @@ public interface DialectUIManager extends DialectUIServices { /** * Dialect manager extension point ID. */ - String ID = "org.eclipse.sirius.ui.dialectui"; + String ID = "org.eclipse.sirius.ui.dialectui"; //$NON-NLS-1$ /** * Extension point attribute for the dialect class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Enable a new dialect. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java index e912740dbc..e0acbdfa44 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java @@ -81,19 +81,19 @@ public class TraceabilityMarkerNavigationProvider implements IGotoMarker { * Key for Sirius's Traceability Markers, representing the internal * representation used by editor (used only for diagrams). */ - public static final String INTERNAL_REPRESENTATION_URI = "DIAGRAM_URI"; + public static final String INTERNAL_REPRESENTATION_URI = "DIAGRAM_URI"; //$NON-NLS-1$ /** * Key for Sirius's Traceability Markers, representing the ID of element * inside its representation. */ - public static final String REPRESENTATION_ELEMENT_ID = "REPRESENTATION_ELEMENT_ID"; + public static final String REPRESENTATION_ELEMENT_ID = "REPRESENTATION_ELEMENT_ID"; //$NON-NLS-1$ /** * Key for Sirius's Traceability Markers, representing the URI of the * representation. */ - public static final String REPRESENTATION_URI = "REPRESENTATION_URI"; + public static final String REPRESENTATION_URI = "REPRESENTATION_URI"; //$NON-NLS-1$ /** * Key indicating that standard Traceability mechanism can be applied to the @@ -105,7 +105,7 @@ public class TraceabilityMarkerNavigationProvider implements IGotoMarker { * Internal key for Sirius's Traceability Markers, indicating that this * marker is a ghost. */ - private static final String TRACEABILITY_INTERNAL_ATTRIBUTE = "traceab_viewpoint_ghost"; + private static final String TRACEABILITY_INTERNAL_ATTRIBUTE = "traceab_viewpoint_ghost"; //$NON-NLS-1$ /** * The editor that have called this MarkerNavigationProvider. It's optional @@ -147,7 +147,7 @@ public class TraceabilityMarkerNavigationProvider implements IGotoMarker { if (foundSession != null) { this.currentSession = foundSession; } else { - String editorTitle = ""; + String editorTitle = ""; //$NON-NLS-1$ if (currentEditor.some()) { editorTitle = currentEditor.get().getTitle(); } @@ -388,7 +388,7 @@ public class TraceabilityMarkerNavigationProvider implements IGotoMarker { shadowMarker.setAttribute(TRACEABILITY_SEMANTIC_ELEMENT_URI_ATTRIBUTE, EcoreUtil.getURI(this.representationToFocus).toString()); shadowMarker.setAttribute(REPRESENTATION_ELEMENT_ID, resource.getURIFragment(representationElementToSelect).toString()); shadowMarker.setAttribute(REPRESENTATION_URI, EcoreUtil.getURI(this.representationToFocus).toString()); - shadowMarker.setAttribute(TRACEABILITY_INTERNAL_ATTRIBUTE, "active"); + shadowMarker.setAttribute(TRACEABILITY_INTERNAL_ATTRIBUTE, "active"); //$NON-NLS-1$ // Step 2 : we sets the focus on the editor and call the goToMarker // method on it diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/editor/SpecificEditorInputTranformer.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/editor/SpecificEditorInputTranformer.java index e79a02037b..0c7208633c 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/editor/SpecificEditorInputTranformer.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/editor/SpecificEditorInputTranformer.java @@ -65,9 +65,9 @@ import com.google.common.collect.Sets; */ public class SpecificEditorInputTranformer { - private static final String SESSION_FILE_EXTENSION = "." + SiriusUtil.SESSION_RESOURCE_EXTENSION; + private static final String SESSION_FILE_EXTENSION = "." + SiriusUtil.SESSION_RESOURCE_EXTENSION; //$NON-NLS-1$ - private static final String DEFAULT_FILE_NAME = "file"; + private static final String DEFAULT_FILE_NAME = "file"; //$NON-NLS-1$ /** * The specific session manager. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/featureExtensions/FeatureExtensionsUIManager.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/featureExtensions/FeatureExtensionsUIManager.java index d6ff3a6bc0..864092ae07 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/featureExtensions/FeatureExtensionsUIManager.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/featureExtensions/FeatureExtensionsUIManager.java @@ -27,12 +27,12 @@ public interface FeatureExtensionsUIManager extends FeatureExtensionUIServices { /** * FeatureExtension manager extension point ID. */ - String ID = "org.eclipse.sirius.ui.featureExtensionsui"; + String ID = "org.eclipse.sirius.ui.featureExtensionsui"; //$NON-NLS-1$ /** * Extension point attribute for the feature extension ui class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Enable a new feature extension. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInput.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInput.java index 0cffb00e14..ab0b2a3aba 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInput.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInput.java @@ -39,7 +39,7 @@ public class SessionEditorInput extends URIEditorInput { * use the URI that is already store in the URIEditorInput because it can be * different in case of fragmentation. */ - private static final String SESSION_RESOURCE_URI = "SESSION_RESOURCE_URI"; + private static final String SESSION_RESOURCE_URI = "SESSION_RESOURCE_URI"; //$NON-NLS-1$ /** * Default editor name @@ -291,7 +291,7 @@ public class SessionEditorInput extends URIEditorInput { @Override public String getToolTipText() { - return getURI().trimFragment().toString() + "/" + getName(); + return getURI().trimFragment().toString() + "/" + getName(); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInputFactory.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInputFactory.java index 3817ddcff6..93ddcdb240 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInputFactory.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionEditorInputFactory.java @@ -26,7 +26,7 @@ public class SessionEditorInputFactory extends URIEditorInputFactory { /** * ID of the factory. */ - public static final String ID = "org.eclipse.sirius.ui.business.api.session.SessionEditorInputFactory"; + public static final String ID = "org.eclipse.sirius.ui.business.api.session.SessionEditorInputFactory"; //$NON-NLS-1$ /** * Create a new factory. @@ -71,8 +71,8 @@ public class SessionEditorInputFactory extends URIEditorInputFactory { * the editor from the memento, it might lead to a lot of * StackOverflowError and NullPointerException. */ - String bundleSymbolicName = memento.getString("bundle"); - String className = memento.getString("class"); + String bundleSymbolicName = memento.getString("bundle"); //$NON-NLS-1$ + String className = memento.getString("class"); //$NON-NLS-1$ if (SessionEditorInput.class.getName().equals(className) && SiriusEditPlugin.ID.equals(bundleSymbolicName)) { element = null; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionSpecificEditorInput.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionSpecificEditorInput.java index 3cd2545dc7..3063c7f1a4 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionSpecificEditorInput.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/session/SessionSpecificEditorInput.java @@ -35,11 +35,11 @@ import org.eclipse.ui.IMemento; */ public class SessionSpecificEditorInput extends SessionEditorInput { - private static final String VIEWPOINT_URI = "VIEWPOINT_URI"; + private static final String VIEWPOINT_URI = "VIEWPOINT_URI"; //$NON-NLS-1$ - private static final String REPRESENTATION_DESCRIPTION_NAME = "REPRESENTATION_DESCRIPTION_NAME"; + private static final String REPRESENTATION_DESCRIPTION_NAME = "REPRESENTATION_DESCRIPTION_NAME"; //$NON-NLS-1$ - private static final String SEMANTIC_MODEL_PATH = "SEMANTIC_MODEL_PATH"; + private static final String SEMANTIC_MODEL_PATH = "SEMANTIC_MODEL_PATH"; //$NON-NLS-1$ private IPath mySemanticModelPath; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/template/RepresentationTemplateEditManager.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/template/RepresentationTemplateEditManager.java index cc34353025..aff8b53cfd 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/template/RepresentationTemplateEditManager.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/template/RepresentationTemplateEditManager.java @@ -28,12 +28,12 @@ public interface RepresentationTemplateEditManager { /** * Representation Template edit manager extension point ID. */ - String ID = "org.eclipse.sirius.ui.representationTemplateEdit"; + String ID = "org.eclipse.sirius.ui.representationTemplateEdit"; //$NON-NLS-1$ /** * Extension point attribute for the representation template class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Singleton manager corresponding to a given Eclipse instance. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java index c9280a4a08..4644a96e97 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelection.java @@ -102,9 +102,9 @@ public final class ViewpointSelection { private static final String VIEWPOINT_SELECTION_WIZARD_PAGE_TITLE = "Viewpoints selection"; - private static final String VIEWPOINTS_SELECTION_WIZARD_PAGE_ID = "viewpointsSelection"; + private static final String VIEWPOINTS_SELECTION_WIZARD_PAGE_ID = "viewpointsSelection"; //$NON-NLS-1$ - private static final String[] COLUMNS = { " ", "icon", "Viewpoint" }; + private static final String[] COLUMNS = { " ", "icon", "Viewpoint" }; //$NON-NLS-1$ /** * Avoid instantiation. @@ -403,7 +403,7 @@ public final class ViewpointSelection { String extended = extension.getViewpointURI(); Pattern pattern = Pattern.compile(extended); if (!atLeastOneUriMatchesPattern(selectedURIs, pattern)) { - result.put(viewpoint.getName(), extended.trim().replaceFirst("^viewpoint:/[^/]+/", "")); + result.put(viewpoint.getName(), extended.trim().replaceFirst("^viewpoint:/[^/]+/", "")); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -665,7 +665,7 @@ public final class ViewpointSelection { private Image getEnhancedImage(final Image image, final Viewpoint viewpoint) { if (!ViewpointRegistry.getInstance().isFromPlugin(viewpoint) && image != null) { - return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); + return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); //$NON-NLS-1$ } return image; } @@ -681,9 +681,9 @@ public final class ViewpointSelection { case 0: if (element instanceof Viewpoint) { final Viewpoint vp = (Viewpoint) element; - image = SiriusEditPlugin.getPlugin().getBundledImage("/icons/full/others/checkbox_inactive.gif"); + image = SiriusEditPlugin.getPlugin().getBundledImage("/icons/full/others/checkbox_inactive.gif"); //$NON-NLS-1$ if (findViewpoint(vp)) { - image = SiriusEditPlugin.getPlugin().getBundledImage("/icons/full/others/checkbox_active.gif"); + image = SiriusEditPlugin.getPlugin().getBundledImage("/icons/full/others/checkbox_active.gif"); //$NON-NLS-1$ } } break; @@ -739,9 +739,9 @@ public final class ViewpointSelection { } if (viewpoint.getEndUserDocumentation() != null && viewpoint.getEndUserDocumentation().trim().length() > 0) { if (toolTip != null) { - toolTip += "\n\n"; + toolTip += "\n\n"; //$NON-NLS-1$ } else { - toolTip = ""; + toolTip = ""; //$NON-NLS-1$ } toolTip += viewpoint.getEndUserDocumentation(); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelectionDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelectionDialog.java index 4c5eaed567..7c15b8a8df 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelectionDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/viewpoint/ViewpointSelectionDialog.java @@ -210,7 +210,7 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { @Override public String toString() { if (parent != null) { - return parent.toString() + " > " + this.getLabel(); + return parent.toString() + " > " + this.getLabel(); //$NON-NLS-1$ } else { return this.getLabel(); } @@ -384,7 +384,7 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { public void update(ViewerCell cell) { Item item = (Item) cell.getElement(); cell.setText(item.getLabel()); - cell.setImage(SiriusEditPlugin.getPlugin().getBundledImage("icons/full/obj16/Viewpoint.gif")); + cell.setImage(SiriusEditPlugin.getPlugin().getBundledImage("icons/full/obj16/Viewpoint.gif")); //$NON-NLS-1$ } @Override @@ -425,10 +425,10 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { if (item != null && item.viewpoint != null) { description.setText(item.viewpoint.getEndUserDocumentation()); } else { - description.setText(""); + description.setText(""); //$NON-NLS-1$ } } else { - description.setText(""); + description.setText(""); //$NON-NLS-1$ } } }); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java index 1d9bd34a76..89aa772404 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/DialectUIManagerImpl.java @@ -245,7 +245,7 @@ public class DialectUIManagerImpl implements DialectUIManager { return dialect.getServices().getEditorName(representation); } } - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java index 890d5389d2..f5c37c4cbf 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java @@ -36,17 +36,17 @@ public class GenericPreferencesInitializer extends AbstractPreferenceInitializer final IPreferenceStore uiPreferenceStore = SiriusEditPlugin.getPlugin().getPreferenceStore(); final IEclipsePreferences defaultCorePreferences = DefaultScope.INSTANCE.getNode(SiriusPlugin.ID); - uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), getValue("_Pref_RefreshOnRepresentationOpening")); - uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name(), getValue("_Pref_ReloadOnLastEditorClose")); - uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name(), getValue("_Pref_SaveWhenNoEditor")); - uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name(), getValue("_Pref_ReactToPermissionIssuesByDisplayingPopup")); - uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name(), getValue("_Pref_DisplayPermissionIssuesThroughDialog")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), getValue("_Pref_RefreshOnRepresentationOpening")); //$NON-NLS-1$ + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name(), getValue("_Pref_ReloadOnLastEditorClose")); //$NON-NLS-1$ + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name(), getValue("_Pref_SaveWhenNoEditor")); //$NON-NLS-1$ + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name(), getValue("_Pref_ReactToPermissionIssuesByDisplayingPopup")); //$NON-NLS-1$ + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name(), getValue("_Pref_DisplayPermissionIssuesThroughDialog")); //$NON-NLS-1$ - final boolean autoRefreshDefValue = getValue("_Pref_AutoRefresh"); + final boolean autoRefreshDefValue = getValue("_Pref_AutoRefresh"); //$NON-NLS-1$ defaultCorePreferences.putBoolean(SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), autoRefreshDefValue); uiPreferenceStore.setDefault(SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), autoRefreshDefValue); - final boolean emptyAirdFragOnControl = getValue("_Pref_EmptyAirdFragmentOnControl"); + final boolean emptyAirdFragOnControl = getValue("_Pref_EmptyAirdFragmentOnControl"); //$NON-NLS-1$ defaultCorePreferences.putBoolean(SiriusPreferencesKeys.PREF_EMPTY_AIRD_FRAGMENT_ON_CONTROL.name(), emptyAirdFragOnControl); uiPreferenceStore.setDefault(SiriusPreferencesKeys.PREF_EMPTY_AIRD_FRAGMENT_ON_CONTROL.name(), emptyAirdFragOnControl); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java index 76baddcd3e..677ab9dcc3 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java @@ -366,11 +366,11 @@ public class EditingSession implements IEditingSession, ISaveablesSource, Refres * @return a key with the editor input. */ private String keyFromInput(final IEditorInput input) { - final String separator = "/"; + final String separator = "/"; //$NON-NLS-1$ String result = null; if (input instanceof URIEditorInput) { final URI uri = ((URIEditorInput) input).getURI(); - final URI deresolved = uri.deresolve(URI.createURI("platform:/resource/")); + final URI deresolved = uri.deresolve(URI.createURI("platform:/resource/")); //$NON-NLS-1$ final String workspacePAth = separator + deresolved.path(); final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(workspacePAth)); if (file != null && file.isAccessible() && file.exists()) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/GenericSWTCallBack.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/GenericSWTCallBack.java index 020d0b527a..f785198bbf 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/GenericSWTCallBack.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/GenericSWTCallBack.java @@ -22,14 +22,9 @@ import org.eclipse.sirius.ui.tools.api.command.AbstractSWTCallback; */ public class GenericSWTCallBack extends AbstractSWTCallback { - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.ui.tools.api.command.AbstractSWTCallback#getVariableNameForRepresentation() - */ @Override protected String getVariableNameForRepresentation() { - return "Representation"; + return "Representation"; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionSaveable.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionSaveable.java index 4cbd4f84d3..e8be032cef 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionSaveable.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionSaveable.java @@ -74,7 +74,7 @@ public class SessionSaveable extends Saveable { */ @Override public ImageDescriptor getImageDescriptor() { - return SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/obj16/SessionResourceFile.gif"); + return SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/obj16/SessionResourceFile.gif"); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionUIManagerImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionUIManagerImpl.java index 74c4651856..1586c13c31 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionUIManagerImpl.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SessionUIManagerImpl.java @@ -196,11 +196,11 @@ public final class SessionUIManagerImpl extends SessionManagerListener.Stub impl * @return a key with the editor input. */ private String keyFromInput(final IEditorInput input) { - final String separator = "/"; + final String separator = "/"; //$NON-NLS-1$ String result = null; if (input instanceof URIEditorInput) { final URI uri = ((URIEditorInput) input).getURI(); - final URI deresolved = uri.deresolve(URI.createURI("platform:/resource/")); + final URI deresolved = uri.deresolve(URI.createURI("platform:/resource/")); //$NON-NLS-1$ final String workspacePAth = separator + deresolved.path(); final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(workspacePAth)); if (file != null && file.isAccessible() && file.exists()) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java index a6d9443a74..5cceb816e2 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/viewpoint/ViewpointSelectionDialog.java @@ -154,25 +154,16 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { * Viewpoint table content provider. */ private final class TableContentProvider implements IStructuredContentProvider { - /** - * {@inheritDoc} - */ @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // Ignore. } - /** - * {@inheritDoc} - */ @Override public void dispose() { // Ignore. } - /** - * {@inheritDoc} - */ @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof List<?> && Iterables.all((List<?>) inputElement, Predicates.instanceOf(Item.class))) { @@ -189,10 +180,6 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { * Viewpoint table label provider */ private final class TableLabelProvider extends ColumnLabelProvider { - - /** - * {@inheritDoc} - */ @Override public Image getImage(final Object element) { Item item = (Item) element; @@ -212,29 +199,23 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { // Add decorator if the viewpoint comes from workspace if (!ViewpointRegistry.getInstance().isFromPlugin(vp)) { - final ImageDescriptor decoratorDescriptor = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/folder_close.gif"); + final ImageDescriptor decoratorDescriptor = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/folder_close.gif"); //$NON-NLS-1$ viewpointImage = SiriusEditPlugin.getPlugin().getImage(new DecorationOverlayIcon(viewpointImage, decoratorDescriptor, IDecoration.BOTTOM_LEFT)); } return viewpointImage; } - /** - * {@inheritDoc} - */ @Override public String getText(final Object element) { Item item = (Item) element; return item.getLabel(); } - /** - * {@inheritDoc} - */ @Override public String getToolTipText(Object element) { Item item = (Item) element; - String toolTip = ""; // no null + String toolTip = ""; // no null //$NON-NLS-1$ Viewpoint viewpoint = item.getViewpoint(); final Resource resource = viewpoint.eResource(); if (resource != null) { @@ -245,7 +226,7 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { String doc = viewpoint.getEndUserDocumentation().trim(); if (!doc.isEmpty()) { if (!toolTip.isEmpty()) { - toolTip += "\n\n"; + toolTip += "\n\n"; //$NON-NLS-1$ } toolTip += doc; @@ -255,25 +236,16 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { return toolTip; } - /** - * {@inheritDoc} - */ @Override public Point getToolTipShift(final Object object) { return new Point(5, 5); } - /** - * {@inheritDoc} - */ @Override public int getToolTipDisplayDelayTime(final Object object) { return 200; } - /** - * {@inheritDoc} - */ @Override public int getToolTipStyle(final Object object) { return SWT.SHADOW_OUT; @@ -284,9 +256,6 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { * Viewpoint table check state listener */ private final class TableCheckStateListener implements ICheckStateListener { - /** - * {@inheritDoc} - */ @Override public void checkStateChanged(CheckStateChangedEvent event) { if (event.getElement() instanceof Item) { @@ -367,9 +336,6 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { })); } - /** - * {@inheritDoc} - */ @Override protected Control createContents(Composite parent) { Control contents = super.createContents(parent); @@ -381,9 +347,6 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { return contents; } - /** - * {@inheritDoc} - */ @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -432,7 +395,7 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { } } })) { - result.put(viewpoint.getName(), extended.trim().replaceFirst("^viewpoint:/[^/]+/", "")); + result.put(viewpoint.getName(), extended.trim().replaceFirst("^viewpoint:/[^/]+/", "")); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -447,10 +410,10 @@ public class ViewpointSelectionDialog extends TitleAreaDialog { * @return error message */ private static String getMissingDependenciesErrorMessage(Map<String, Collection<String>> missingDependencies) { - return Joiner.on("\n").withKeyValueSeparator(" requires: ").join(Maps.transformValues(missingDependencies, new Function<Collection<String>, String>() { + return Joiner.on("\n").withKeyValueSeparator(" requires: ").join(Maps.transformValues(missingDependencies, new Function<Collection<String>, String>() { //$NON-NLS-1$ @Override public String apply(Collection<String> from) { - return Joiner.on(", ").join(from); + return Joiner.on(", ").join(from); //$NON-NLS-1$ } })); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/AbstractCreateRepresentationFromRepresentationCreationDescription.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/AbstractCreateRepresentationFromRepresentationCreationDescription.java index 76587a018f..b0eeaa9fde 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/AbstractCreateRepresentationFromRepresentationCreationDescription.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/AbstractCreateRepresentationFromRepresentationCreationDescription.java @@ -109,7 +109,7 @@ public abstract class AbstractCreateRepresentationFromRepresentationCreationDesc if (desc.getRepresentationDescription() == null) { isEnabled = false; } else { - final CreateRepresentationCommand command = commandFactory.buildCreateRepresentationFromDescription(desc, target, ""); + final CreateRepresentationCommand command = commandFactory.buildCreateRepresentationFromDescription(desc, target, ""); //$NON-NLS-1$ return command.canExecute(); } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/ExportAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/ExportAction.java index 22a20a7293..55f957fce8 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/ExportAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/ExportAction.java @@ -199,8 +199,8 @@ public class ExportAction extends WorkspaceModifyOperation { StringBuffer messageExceptionForDialog = new StringBuffer(); messageExceptionForDialog.append("One or more representations could not be exported because they are too large: "); for (Throwable thr : messageException) { - messageExceptionForDialog.append("\n"); - messageExceptionForDialog.append(" - "); + messageExceptionForDialog.append("\n"); //$NON-NLS-1$ + messageExceptionForDialog.append(" - "); //$NON-NLS-1$ messageExceptionForDialog.append(thr.getMessage()); } // Create a popup menu to inform user that representations diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/IExportRepresentationsAsImagesExtension.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/IExportRepresentationsAsImagesExtension.java index 66823727fd..9a773ef076 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/IExportRepresentationsAsImagesExtension.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/actions/export/IExportRepresentationsAsImagesExtension.java @@ -22,8 +22,8 @@ package org.eclipse.sirius.ui.tools.api.actions.export; public interface IExportRepresentationsAsImagesExtension { /** The extension point ID. */ - String ID = "org.eclipse.sirius.ui.exportRepresentationsAsImagesExtension"; + String ID = "org.eclipse.sirius.ui.exportRepresentationsAsImagesExtension"; //$NON-NLS-1$ /** The class attribute. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/IAssistContentProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/IAssistContentProvider.java index 26e0436636..c543896685 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/IAssistContentProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/IAssistContentProvider.java @@ -26,12 +26,12 @@ public interface IAssistContentProvider extends IContentProposalProvider, IConte /** * The ID. */ - String ID = "org.eclipse.sirius.ui.assistContentProvider"; + String ID = "org.eclipse.sirius.ui.assistContentProvider"; //$NON-NLS-1$ /** * The class attribute. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * The auto activation characters for completion proposal. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/TextContentProposalProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/TextContentProposalProvider.java index cd25e4c1af..49065da436 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/TextContentProposalProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/assist/TextContentProposalProvider.java @@ -70,7 +70,7 @@ public class TextContentProposalProvider implements IAssistContentProvider { * Get interpreter prefixes */ List<ContentProposal> prefixes = CompoundInterpreter.INSTANCE.getAllNewEmtpyExpressions(); - return new ContentProposalConverter("").convertToJFaceContentProposals(prefixes); + return new ContentProposalConverter("").convertToJFaceContentProposals(prefixes); //$NON-NLS-1$ } else { /* * get interpreter proposal and viewpoint variables diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/color/VisualBindingManager.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/color/VisualBindingManager.java index b28ec1795e..b1f333b892 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/color/VisualBindingManager.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/color/VisualBindingManager.java @@ -51,7 +51,7 @@ import com.google.common.base.Objects; * @author cbrun, pcdavid */ public class VisualBindingManager { - private static final String DEFAULT_FONT_NAME = "ARIAL"; + private static final String DEFAULT_FONT_NAME = "ARIAL"; //$NON-NLS-1$ private static VisualBindingManager defaultInstance; @@ -259,7 +259,7 @@ public class VisualBindingManager { // Ideally get the default color from the preferences page // (IPreferenceConstants.PREF_FONT_COLOR), but no editor (so // preferences) from this plugin - return getColorFromName("black"); + return getColorFromName("black"); //$NON-NLS-1$ } } @@ -383,8 +383,8 @@ public class VisualBindingManager { final int min = pmin; int max = pmax; int value = pvalue; - final Color red = this.getColorFromName("red"); - final Color green = this.getColorFromName("green"); + final Color red = this.getColorFromName("red"); //$NON-NLS-1$ + final Color green = this.getColorFromName("green"); //$NON-NLS-1$ if (max <= min) { max = min + 1; @@ -457,7 +457,7 @@ public class VisualBindingManager { */ public SystemColors findClosestStandardColor(final RGBValues values) { final SystemColor color = DescriptionFactory.eINSTANCE.createSystemColor(); - color.setName("<anonymous>"); + color.setName("<anonymous>"); //$NON-NLS-1$ color.setRed(values.getRed()); color.setGreen(values.getGreen()); color.setBlue(values.getBlue()); @@ -748,7 +748,7 @@ public class VisualBindingManager { * @return return the color description corresponding to the color name. */ public SystemColor getSystemColorDescription(final String name) { - final String uri = SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors/@entries[name='" + name + "']"; + final String uri = SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors/@entries[name='" + name + "']"; //$NON-NLS-1$ //$NON-NLS-2$ final EObject color = EcoreUtil.create(DescriptionPackage.eINSTANCE.getSystemColor()); final URI colorURI = URI.createURI(uri); ((InternalEObject) color).eSetProxyURI(colorURI); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/command/AbstractSWTCallback.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/command/AbstractSWTCallback.java index ff1e2a45a8..d79c594874 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/command/AbstractSWTCallback.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/command/AbstractSWTCallback.java @@ -138,9 +138,9 @@ public abstract class AbstractSWTCallback implements UICallBack { description = Messages.createRepresentationInputDialog_RepresentationDescriptionLabel + representationDescription; } if (description == null) { - description = ""; + description = ""; //$NON-NLS-1$ } else { - description += "\n\n"; + description += "\n\n"; //$NON-NLS-1$ } description += Messages.createRepresentationInputDialog_NewRepresentationNameLabel; final InputDialog askSiriusName = new InputDialog(Display.getDefault().getActiveShell(), Messages.createRepresentationInputDialog_Title, description, defaultName, new IInputValidator() { @@ -303,7 +303,7 @@ public abstract class AbstractSWTCallback implements UICallBack { * @see org.eclipse.sirius.tools.api.command.ui.UICallBack#getSessionDisplayed(org.eclipse.sirius.business.api.session.Session) */ public String getSessionNameToDisplayWhileSaving(Session session) { - String name = ""; + String name = ""; //$NON-NLS-1$ if (session != null) { String projectName = null; Resource representationsFileResource = session.getSessionResource(); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/control/SiriusControlHandler.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/control/SiriusControlHandler.java index f3aa2f7fe2..31ecdfb440 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/control/SiriusControlHandler.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/control/SiriusControlHandler.java @@ -291,9 +291,9 @@ public class SiriusControlHandler extends AbstractHandler { final StringBuilder uri = new StringBuilder(); URI objResourceURI = obj.eResource().getURI(); uri.append(URI.decode(objResourceURI.trimFileExtension().toString())); - uri.append("_"); + uri.append("_"); //$NON-NLS-1$ uri.append(EMFCoreUtil.getName(obj)); - uri.append("."); + uri.append("."); //$NON-NLS-1$ uri.append(objResourceURI.fileExtension()); return uri.toString(); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/AbstractExportRepresentationsAsImagesDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/AbstractExportRepresentationsAsImagesDialog.java index f9db84296b..f3d8a826c5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/AbstractExportRepresentationsAsImagesDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/AbstractExportRepresentationsAsImagesDialog.java @@ -49,7 +49,7 @@ public abstract class AbstractExportRepresentationsAsImagesDialog extends Dialog /** * The file separator alternative. */ - public static final String FILE_SEPARATOR_ALTERNATIVE = "_"; + public static final String FILE_SEPARATOR_ALTERNATIVE = "_"; //$NON-NLS-1$ /** * Default extension image. @@ -59,7 +59,7 @@ public abstract class AbstractExportRepresentationsAsImagesDialog extends Dialog /** * The character extension file ("."). */ - protected static final String CHARACTER_EXTENSION_FILE = "."; + protected static final String CHARACTER_EXTENSION_FILE = "."; //$NON-NLS-1$ /** * The list of values for this enumerated type. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/ExportOneRepresentationAsImageDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/ExportOneRepresentationAsImageDialog.java index 7850624ff5..cb7b3f22c0 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/ExportOneRepresentationAsImageDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/dialogs/ExportOneRepresentationAsImageDialog.java @@ -172,7 +172,7 @@ public class ExportOneRepresentationAsImageDialog extends AbstractExportRepresen IPath path = new Path(folder); if (isExistingFolder(path) || path.getFileExtension() == null) { path = path.addTrailingSeparator(); - path = path.append(fileName.replaceAll("[/\\\\]", FILE_SEPARATOR_ALTERNATIVE)); + path = path.append(fileName.replaceAll("[/\\\\]", FILE_SEPARATOR_ALTERNATIVE)); //$NON-NLS-1$ String extension = imageFormat.getName().toLowerCase(); path = path.addFileExtension(extension); String newExtensionFilePath = path.toFile().getPath(); @@ -310,7 +310,7 @@ public class ExportOneRepresentationAsImageDialog extends AbstractExportRepresen setDialogErrorState(INVALID_PATH_MESSAGE); } else if (!directory.exists()) { setDialogErrorState(FOLDER_NOT_EXIST_MESSAGE); - } else if (path.toString().endsWith("/") || path.toString().endsWith(CHARACTER_EXTENSION_FILE)) { + } else if (path.toString().endsWith("/") || path.toString().endsWith(CHARACTER_EXTENSION_FILE)) { //$NON-NLS-1$ setDialogErrorState(INVALID_PATH_MESSAGE); } @@ -348,7 +348,7 @@ public class ExportOneRepresentationAsImageDialog extends AbstractExportRepresen imageFormatCombo.setText(extension.getName()); isPresent = true; break; - } else if ("jpeg".equals(fileExtension.toLowerCase())) { + } else if ("jpeg".equals(fileExtension.toLowerCase())) { //$NON-NLS-1$ imageFormatCombo.setText(imageFormat.JPG.getName()); isPresent = true; break; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/ModelingPerspective.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/ModelingPerspective.java index 34aa139abb..5436071d5f 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/ModelingPerspective.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/ModelingPerspective.java @@ -20,6 +20,6 @@ public interface ModelingPerspective { /** * Perspective ID. */ - String ID = "org.eclipse.sirius.ui.tools.perspective.modeling"; + String ID = "org.eclipse.sirius.ui.tools.perspective.modeling"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/profiler/SiriusTasks.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/profiler/SiriusTasks.java index a42702fe0a..09f941e598 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/profiler/SiriusTasks.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/profiler/SiriusTasks.java @@ -26,32 +26,32 @@ public final class SiriusTasks { /** * The Acceleo category image path. */ - public static final String IMAGES_ACCELEO_GIF = "/images/acceleo.gif"; + public static final String IMAGES_ACCELEO_GIF = "/images/acceleo.gif"; //$NON-NLS-1$ /** * The GEF category image path. */ - public static final String IMAGES_GEF_GIF = "/images/gef.gif"; + public static final String IMAGES_GEF_GIF = "/images/gef.gif"; //$NON-NLS-1$ /** * The GMF category image path. */ - public static final String IMAGES_GMF_GIF = "/images/gmf.gif"; + public static final String IMAGES_GMF_GIF = "/images/gmf.gif"; //$NON-NLS-1$ /** * Image used to represent the viewpoint category. */ - public static final String IMAGES_VIEWPOINT = "/images/viewpoint.gif"; + public static final String IMAGES_VIEWPOINT = "/images/viewpoint.gif"; //$NON-NLS-1$ /** * Image used to represent the generic modeler category. */ - public static final String IMAGES_MODELER = "/images/modeler.gif"; + public static final String IMAGES_MODELER = "/images/modeler.gif"; //$NON-NLS-1$ /** * The SWT category image path. */ - public static final String IMAGES_SWT = "/images/swt.gif"; + public static final String IMAGES_SWT = "/images/swt.gif"; //$NON-NLS-1$ /** * Task singleton. @@ -173,7 +173,7 @@ public final class SiriusTasks { /** * Task singleton. */ - public static final ProfilerTask INSTANCE_OF = new ProfilerTask(SiriusTasksKey.MM_EXTENSION_CAT, SiriusTasksKey.INSTANCE_OF_KEY, getImagePath("/images/mmext.gif")); + public static final ProfilerTask INSTANCE_OF = new ProfilerTask(SiriusTasksKey.MM_EXTENSION_CAT, SiriusTasksKey.INSTANCE_OF_KEY, getImagePath("/images/mmext.gif")); //$NON-NLS-1$ /** * Task singleton. @@ -377,7 +377,7 @@ public final class SiriusTasks { } private static String getImagePath(String key) { - return "/" + SiriusEditPlugin.ID + key; + return "/" + SiriusEditPlugin.ID + key; //$NON-NLS-1$ } // CHECKSTYLE:OFF diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java index 88e0120d00..37fc7b6347 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/project/ViewpointSpecificationProject.java @@ -96,7 +96,7 @@ public final class ViewpointSpecificationProject { /** * The line separator to use on the running platform. */ - private static final String NL = System.getProperty("line.separator"); + private static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$ /** * This caches an instance of the model package. @@ -114,7 +114,7 @@ public final class ViewpointSpecificationProject { */ private static final String DEFAULT_PACKAGE_NAME = "defaultpackage"; //$NON-NLS-1$ - private static final String UNAUTHORIZED_CHARACTER = "[^a-zA-Z0-9_\\.-]"; + private static final String UNAUTHORIZED_CHARACTER = "[^a-zA-Z0-9_\\.-]"; //$NON-NLS-1$ /** * Default constructor. @@ -179,7 +179,7 @@ public final class ViewpointSpecificationProject { project.open(monitor); ViewpointSpecificationProject.createFolder(project, monitor, "src"); //$NON-NLS-1$ - ViewpointSpecificationProject.createFolder(project, monitor, "description"); + ViewpointSpecificationProject.createFolder(project, monitor, "description"); //$NON-NLS-1$ IFile modelFile; try { @@ -254,7 +254,7 @@ public final class ViewpointSpecificationProject { final EObject rootObject = ViewpointSpecificationProject.createInitialModel(modelInitialObjectName); if (rootObject != null) { if (rootObject instanceof Group) { - ((Group) rootObject).setName(modelName.replaceAll("." + VIEWPOINT_MODEL_EXTENSION, "")); + ((Group) rootObject).setName(modelName.replaceAll("." + VIEWPOINT_MODEL_EXTENSION, "")); //$NON-NLS-1$ //$NON-NLS-2$ } resource.getContents().add(rootObject); } @@ -325,12 +325,12 @@ public final class ViewpointSpecificationProject { * is the monitor */ private static void convert(final IProject prj, final String modelName, final IProgressMonitor monitor) { - final String modelNameWithoutExtension = modelName.replaceAll("\\." + VIEWPOINT_MODEL_EXTENSION + "$", ""); + final String modelNameWithoutExtension = modelName.replaceAll("\\." + VIEWPOINT_MODEL_EXTENSION + "$", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // WARNING: variable names should not share any common prefix. // applyReplacements() does not deal with this case. final Map<String, String> replacements = new HashMap<String, String>(); - final String projectName = prj.getName().replaceAll(UNAUTHORIZED_CHARACTER, "_"); + final String projectName = prj.getName().replaceAll(UNAUTHORIZED_CHARACTER, "_"); //$NON-NLS-1$ final String packageName; if (SourceVersion.isName(prj.getName())) { @@ -344,14 +344,14 @@ public final class ViewpointSpecificationProject { replacements.put("pluginId", projectName); //$NON-NLS-1$ replacements.put("projectName", projectName); //$NON-NLS-1$ replacements.put("modelName", modelNameWithoutExtension); //$NON-NLS-1$ - replacements.put("packageName", packageName); + replacements.put("packageName", packageName); //$NON-NLS-1$ - ViewpointSpecificationProject.createFileFromTemplate(prj, "build.properties", "resources/build.properties", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$ - ViewpointSpecificationProject.createFileFromTemplate(prj, "src/" + packageName.replaceAll("\\.", "/") + "/Activator.java", "resources/Activator.java_", replacements, monitor); - ViewpointSpecificationProject.createFileFromTemplate(prj, ".classpath", "resources/classpath.xml", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$ - ViewpointSpecificationProject.createFileFromTemplate(prj, "META-INF/MANIFEST.MF", "resources/MANIFEST.MF", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$ - ViewpointSpecificationProject.createFileFromTemplate(prj, ".project", "resources/project.xml", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$ - ViewpointSpecificationProject.createFileFromTemplate(prj, "plugin.xml", "resources/plugin.xml", replacements, monitor); //$NON-NLS-1$ $NON-NLS-2$ + ViewpointSpecificationProject.createFileFromTemplate(prj, "build.properties", "resources/build.properties", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ + ViewpointSpecificationProject.createFileFromTemplate(prj, "src/" + packageName.replaceAll("\\.", "/") + "/Activator.java", "resources/Activator.java_", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + ViewpointSpecificationProject.createFileFromTemplate(prj, ".classpath", "resources/classpath.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ + ViewpointSpecificationProject.createFileFromTemplate(prj, "META-INF/MANIFEST.MF", "resources/MANIFEST.MF", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ + ViewpointSpecificationProject.createFileFromTemplate(prj, ".project", "resources/project.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ + ViewpointSpecificationProject.createFileFromTemplate(prj, "plugin.xml", "resources/plugin.xml", replacements, monitor); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ addAcceleoNature(prj); } @@ -359,7 +359,7 @@ public final class ViewpointSpecificationProject { private static void addAcceleoNature(IProject projet) { ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class); - Command addAcceleoNatureCommand = commandService.getCommand("org.eclipse.sirius.common.acceleo.mtl.ide.internal.convert"); + Command addAcceleoNatureCommand = commandService.getCommand("org.eclipse.sirius.common.acceleo.mtl.ide.internal.convert"); //$NON-NLS-1$ // If the acceleo interpreter is not present, do not configure. // the acceleo conversion command is not API yet, so, it @@ -454,7 +454,7 @@ public final class ViewpointSpecificationProject { private static String applyReplacements(final String text, final Map<String, String> replacements) { String result = text; for (Entry<String, String> replacement : replacements.entrySet()) { - result = result.replaceAll("%" + replacement.getKey(), replacement.getValue()); + result = result.replaceAll("%" + replacement.getKey(), replacement.getValue()); //$NON-NLS-1$ } return result; } @@ -512,7 +512,7 @@ public final class ViewpointSpecificationProject { } private static IFile getModelFile(final IProject project, final String modelName) { - return ResourcesPlugin.getWorkspace().getRoot().getFile(project.getFullPath().append("description/" + modelName)); + return ResourcesPlugin.getWorkspace().getRoot().getFile(project.getFullPath().append("description/" + modelName)); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/AbstractCompositeEObjectPropertySource.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/AbstractCompositeEObjectPropertySource.java index 9e242085f3..839250078a 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/AbstractCompositeEObjectPropertySource.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/AbstractCompositeEObjectPropertySource.java @@ -196,21 +196,21 @@ public abstract class AbstractCompositeEObjectPropertySource implements IPropert result = labelProvider.getText(eObject); } else { result = eObject.eClass().getName(); - final EStructuralFeature nameStructuralFeature = eObject.eClass().getEStructuralFeature("name"); + final EStructuralFeature nameStructuralFeature = eObject.eClass().getEStructuralFeature("name"); //$NON-NLS-1$ if (nameStructuralFeature != null) { final String name = (String) eObject.eGet(nameStructuralFeature); if (name != null) { - result = result + " " + name; + result = result + " " + name; //$NON-NLS-1$ } } } if (result == null) { - result = ""; + result = ""; //$NON-NLS-1$ } String resultTmp = result; int i = 2; while (categoryNames.values().contains(resultTmp)) { - resultTmp = result + " " + i++; + resultTmp = result + " " + i++; //$NON-NLS-1$ } result = resultTmp; categoryNames.put(eObject, result); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/DTablePropertySheetpage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/DTablePropertySheetpage.java index df98cafe0e..3800ad9bcb 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/DTablePropertySheetpage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/properties/DTablePropertySheetpage.java @@ -78,13 +78,13 @@ public class DTablePropertySheetpage extends TabbedPropertySheetPage { boolean isCurrentTabNull = true; try { try { - Class.forName("org.eclipse.ui.internal.views.properties.tabbed.view.Tab"); + Class.forName("org.eclipse.ui.internal.views.properties.tabbed.view.Tab"); //$NON-NLS-1$ // We are in eclipse 3.3 - final Method searchMethod = this.getClass().getMethod("getCurrentTab", (Class<?>[]) null); + final Method searchMethod = this.getClass().getMethod("getCurrentTab", (Class<?>[]) null); //$NON-NLS-1$ isCurrentTabNull = searchMethod.invoke(this) == null; } catch (final ClassNotFoundException cnfe) { // We are in eclipse 3.4 - final Method searchMethod = this.getClass().getMethod("getCurrentTab", (Class<?>[]) null); + final Method searchMethod = this.getClass().getMethod("getCurrentTab", (Class<?>[]) null); //$NON-NLS-1$ isCurrentTabNull = searchMethod.invoke(this) == null; } } catch (final SecurityException e) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/interpreterview/InterpreterView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/interpreterview/InterpreterView.java index dcbc623fdf..b9a7040077 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/interpreterview/InterpreterView.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/interpreterview/InterpreterView.java @@ -21,6 +21,6 @@ public interface InterpreterView { /** * View ID. */ - String ID = "org.eclipse.sirius.ui.tools.views.interpreterview"; + String ID = "org.eclipse.sirius.ui.tools.views.interpreterview"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/IModelExplorerView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/IModelExplorerView.java index 5f9ef0a207..ebfede0ffa 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/IModelExplorerView.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/views/modelexplorerview/IModelExplorerView.java @@ -19,7 +19,7 @@ public interface IModelExplorerView { /** * View ID. */ - String ID = "org.eclipse.sirius.ui.tools.views.model.explorer"; + String ID = "org.eclipse.sirius.ui.tools.views.model.explorer"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java index ac60c2d770..7caee6fe03 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/wizards/page/ViewpointsSelectionWizardPage.java @@ -359,7 +359,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { if (viewpoint != null) { final String doc = viewpoint.getEndUserDocumentation(); if (!StringUtil.isEmpty(doc)) - return doc.startsWith("<html>"); + return doc.startsWith("<html>"); //$NON-NLS-1$ } return false; } @@ -375,11 +375,11 @@ public class ViewpointsSelectionWizardPage extends WizardPage { } private void extractUrlToRewrite(String document, Set<String> urlToRewrite) { - String imgSrcPattern = "img src=\""; + String imgSrcPattern = "img src=\""; //$NON-NLS-1$ int patternStartIndex = document.indexOf(imgSrcPattern); if (patternStartIndex != -1) { int imgSrcStartIndex = patternStartIndex + imgSrcPattern.length(); - int imgSrcStopIndex = document.indexOf("\"", imgSrcStartIndex); + int imgSrcStopIndex = document.indexOf("\"", imgSrcStartIndex); //$NON-NLS-1$ if (imgSrcStopIndex != -1) { String newToRewrite = document.substring(imgSrcStartIndex, imgSrcStopIndex); urlToRewrite.add(newToRewrite); @@ -398,7 +398,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { StringBuilder css = new StringBuilder(); appendCss(css); - String headClose = "</head>"; + String headClose = "</head>"; //$NON-NLS-1$ newDocument = newDocument.replace(headClose, css.append(headClose)); return newDocument; @@ -408,7 +408,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { final URI uri = viewpoint.eResource().getURI(); String pluginId = uri.segment(1); - String rewrittenURL = ""; + String rewrittenURL = ""; //$NON-NLS-1$ if (uri.isPlatformPlugin()) { Bundle bundle = Platform.getBundle(pluginId); @@ -425,7 +425,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { } else { final IWorkspace workspace = ResourcesPlugin.getWorkspace(); - final IPath path = new Path("/" + pluginId + url); + final IPath path = new Path("/" + pluginId + url); //$NON-NLS-1$ if (workspace.getRoot().exists(path)) { IResource resource = workspace.getRoot().findMember(path); rewrittenURL = resource.getLocation().toFile().toURI().toString(); @@ -441,19 +441,19 @@ public class ViewpointsSelectionWizardPage extends WizardPage { } private ViewpointsSelectionWizardPage begin(StringBuilder content) { - content.append("<html>"); + content.append("<html>"); //$NON-NLS-1$ return this; } private ViewpointsSelectionWizardPage head(StringBuilder content) { - content.append("<head>"); + content.append("<head>"); //$NON-NLS-1$ appendCss(content); - content.append("</head>"); + content.append("</head>"); //$NON-NLS-1$ return this; } private ViewpointsSelectionWizardPage body(StringBuilder content, Viewpoint viewpoint) { - content.append("<body>"); + content.append("<body>"); //$NON-NLS-1$ if (viewpoint == null) { content.append("<br><br><center><b>Documentation</b></center>"); @@ -464,7 +464,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { else content.append("no documentation for this viewpoint"); } - content.append("</body>"); + content.append("</body>"); //$NON-NLS-1$ return this; } @@ -473,15 +473,15 @@ public class ViewpointsSelectionWizardPage extends WizardPage { FontData data = currentFont.getFontData()[0]; String fontName = data.getName(); int fontHeight = data.getHeight() + 3; - content.append("<style type=\"text/css\">"); - content.append("body{font-family:" + fontName + ",Arial, sans-serif;}"); - content.append("body{font-size:" + fontHeight + "px;}"); - content.append("</style>"); + content.append("<style type=\"text/css\">"); //$NON-NLS-1$ + content.append("body{font-family:" + fontName + ",Arial, sans-serif;}"); //$NON-NLS-1$ //$NON-NLS-2$ + content.append("body{font-size:" + fontHeight + "px;}"); //$NON-NLS-1$ //$NON-NLS-2$ + content.append("</style>"); //$NON-NLS-1$ return content; } private String end(StringBuilder content) { - content.append("</html>"); + content.append("</html>"); //$NON-NLS-1$ return content.toString(); } @@ -539,7 +539,7 @@ public class ViewpointsSelectionWizardPage extends WizardPage { private Image getEnhancedImage(final Image image, final Viewpoint viewpoint) { // Add decorator if the viewpoint comes from workspace if (!ViewpointRegistry.getInstance().isFromPlugin(viewpoint) && image != null) { - return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); + return SiriusEditPlugin.getPlugin().getImage(getOverlayedDescriptor(image, "icons/full/decorator/folder_close.gif")); //$NON-NLS-1$ } return image; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java index 734e6e9eeb..ae82b24162 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddModelDependencyAction.java @@ -53,7 +53,7 @@ public class AddModelDependencyAction extends Action { */ public AddModelDependencyAction(Session session) { super("Add Model"); - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/add.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/add.gif"); //$NON-NLS-1$ setImageDescriptor(descriptor); this.session = session; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddSemanticResourceAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddSemanticResourceAction.java index f100b47ffb..bac758facc 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddSemanticResourceAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/AddSemanticResourceAction.java @@ -55,7 +55,7 @@ public class AddSemanticResourceAction extends Action { */ public AddSemanticResourceAction(final Collection<URI> sessionsURIs) { super("Add Model"); - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/add.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/add.gif"); //$NON-NLS-1$ setImageDescriptor(descriptor); this.sessionsURI = sessionsURIs; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/RemoveRepresentationResourceAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/RemoveRepresentationResourceAction.java index 838ea08ecd..64c9ad0da5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/RemoveRepresentationResourceAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/analysis/RemoveRepresentationResourceAction.java @@ -55,7 +55,7 @@ public class RemoveRepresentationResourceAction extends Action { * current session. */ public RemoveRepresentationResourceAction(final Collection<Resource> diagramResources, final Session session) { - super("Remove from representations file", AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/remove.gif")); + super("Remove from representations file", AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/remove.gif")); //$NON-NLS-2$ this.diagramResources = Sets.newHashSet(diagramResources); this.session = session; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/control/ControlAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/control/ControlAction.java index 5f4efd4a18..487c1eb6b9 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/control/ControlAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/control/ControlAction.java @@ -193,9 +193,9 @@ public class ControlAction extends CommandActionHandler { final StringBuilder defaultURI = new StringBuilder(); URI controledObjectResourceURI = controledObject.eResource().getURI(); defaultURI.append(URI.decode(controledObjectResourceURI.trimFileExtension().toString())); - defaultURI.append("_"); + defaultURI.append("_"); //$NON-NLS-1$ defaultURI.append(EMFCoreUtil.getName(controledObject)); - defaultURI.append("."); + defaultURI.append("."); //$NON-NLS-1$ defaultURI.append(controledObjectResourceURI.fileExtension()); this.uriField.setText(URI.encodeFragment(defaultURI.toString(), true)); return control; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/export/AbstractExportRepresentationsAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/export/AbstractExportRepresentationsAction.java index a3dc34f898..ff298093d4 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/export/AbstractExportRepresentationsAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/export/AbstractExportRepresentationsAction.java @@ -167,7 +167,7 @@ public abstract class AbstractExportRepresentationsAction extends Action { } else if (uriQuery.isInMemoryURI()) { String opaquePart = mainSessionResourceURI.opaquePart(); if (!StringUtil.isEmpty(opaquePart)) { - String[] segments = opaquePart.split(Pattern.quote("/")); + String[] segments = opaquePart.split(Pattern.quote("/")); //$NON-NLS-1$ if (segments != null && segments.length > 0) { String projectName = segments[0]; IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/session/OpenViewpointSelectionAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/session/OpenViewpointSelectionAction.java index aee92a3a58..76a371bd65 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/session/OpenViewpointSelectionAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/actions/session/OpenViewpointSelectionAction.java @@ -49,7 +49,7 @@ public class OpenViewpointSelectionAction extends Action { * should be changed */ public OpenViewpointSelectionAction(URI sessionURI) { - super(VIEWPOINTS_SELECTION_ACTION_TEXT, SiriusEditPlugin.INSTANCE.getImageDescriptor("full/obj16/Viewpoint.gif")); + super(VIEWPOINTS_SELECTION_ACTION_TEXT, SiriusEditPlugin.INSTANCE.getImageDescriptor("full/obj16/Viewpoint.gif")); //$NON-NLS-1$ this.sessionURI = sessionURI; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/dialogs/SemanticResourceDialog.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/dialogs/SemanticResourceDialog.java index 20aac47396..d4025af172 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/dialogs/SemanticResourceDialog.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/dialogs/SemanticResourceDialog.java @@ -45,7 +45,7 @@ import com.google.common.collect.Lists; */ public class SemanticResourceDialog extends ResourceDialog { - private static final String SEPARATOR = " "; + private static final String SEPARATOR = " "; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTableViewerManager.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTableViewerManager.java index b32a40033d..c280dca1d7 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTableViewerManager.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTableViewerManager.java @@ -42,12 +42,12 @@ public abstract class AbstractDTableViewerManager { /** * Boolean for OS. */ - public static final boolean IS_GTK_OS = "gtk".equals(SWT.getPlatform()); + public static final boolean IS_GTK_OS = "gtk".equals(SWT.getPlatform()); //$NON-NLS-1$ /** * Use to store the semantic column in SWT column. */ - public static final String TABLE_COLUMN_DATA = "org.eclipse.sirius.table.ui.dTableColumn"; + public static final String TABLE_COLUMN_DATA = "org.eclipse.sirius.table.ui.dTableColumn"; //$NON-NLS-1$ /** * The imageRegistry for the action images. @@ -87,7 +87,7 @@ public abstract class AbstractDTableViewerManager { /** * Menu manager. */ - protected final MenuManager mgr = new MenuManager("#PopupMenu"); + protected final MenuManager mgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ /** * Indicates whether the odesign file has changed since the last load of the diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTreeEditor.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTreeEditor.java index f6ca56284a..6d0a36bda5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTreeEditor.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/AbstractDTreeEditor.java @@ -92,12 +92,12 @@ public abstract class AbstractDTreeEditor extends EditorPart implements DialectE /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ private static final ImageDescriptor LOCK_BY_ME_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation - .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); + .getBundledImageDescriptor("icons/full/decorator/permission_granted_to_current_user_exclusively.gif"); //$NON-NLS-1$ /** The PERMISSION_GRANTED_TO_CURRENT_USER_EXCLUSIVELY icon descriptor. */ - private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); + private static final ImageDescriptor LOCK_BY_OTHER_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_denied.gif"); //$NON-NLS-1$ - private static final ImageDescriptor NO_WRITE_PERMISSION_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_no_write.gif");; + private static final ImageDescriptor NO_WRITE_PERMISSION_IMAGE_DESCRIPTOR = SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/full/decorator/permission_no_write.gif");; //$NON-NLS-1$ /** * This is the one adapter factory used for providing views of the model. @@ -492,7 +492,7 @@ public abstract class AbstractDTreeEditor extends EditorPart implements DialectE // Removes the xmi id if the selected element and replace it with the // name of the tab. String title = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().getText(); - final int end = title.lastIndexOf(".aird#"); + final int end = title.lastIndexOf(".aird#"); //$NON-NLS-1$ if (end > -1) { title = title.substring(0, end + 6) + this.getPartName() + " - Eclipse Platform"; PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setText(title); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/MenuHelper.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/MenuHelper.java index f3c8d188eb..c1efeb6290 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/MenuHelper.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/editor/MenuHelper.java @@ -51,7 +51,7 @@ public final class MenuHelper { /** * The separator name for navigate representation menu. */ - public static final String OPEN_REPRESENTATION_GROUP_SEPARATOR = "openRepresentationGroup"; + public static final String OPEN_REPRESENTATION_GROUP_SEPARATOR = "openRepresentationGroup"; //$NON-NLS-1$ /** * Private default constructor to avoid instantiation. @@ -146,7 +146,7 @@ public final class MenuHelper { representationName = "(unnamed)"; RepresentationDescription representationDescription = DialectManager.INSTANCE.getDescription(representation); if (representationDescription != null) { - representationName += " " + new IdentifiedElementQuery(representationDescription).getLabel(); + representationName += " " + new IdentifiedElementQuery(representationDescription).getLabel(); //$NON-NLS-1$ } } return buildOpenRepresentationAction(session, representation, representationName, adapterFactory); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerModelingPerspective.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerModelingPerspective.java index 65b8fc7de9..a0b6f9f20a 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerModelingPerspective.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerModelingPerspective.java @@ -64,7 +64,7 @@ public class DesignerModelingPerspective implements IPerspectiveFactory, Modelin layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.BOTTOM, 0.50f, IModelExplorerView.ID); // Place problem, properties and advance views to bottom of editor area. - final IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float) 0.65, editorArea); + final IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float) 0.65, editorArea); //$NON-NLS-1$ bottom.addView(IPageLayout.ID_PROP_SHEET); bottom.addView(IPageLayout.ID_PROBLEM_VIEW); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/properties/SiriusCellEditorProviderCollector.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/properties/SiriusCellEditorProviderCollector.java index ea755cd9c1..9febb8e305 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/properties/SiriusCellEditorProviderCollector.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/properties/SiriusCellEditorProviderCollector.java @@ -37,7 +37,7 @@ public final class SiriusCellEditorProviderCollector implements CellEditorProvid /** * Extension point ID. */ - public static final String EXTENSION_POINT_ID = "org.eclipse.sirius.ui.siriuspropertiescelleditor"; + public static final String EXTENSION_POINT_ID = "org.eclipse.sirius.ui.siriuspropertiescelleditor"; //$NON-NLS-1$ /** * Singleton. @@ -74,7 +74,7 @@ public final class SiriusCellEditorProviderCollector implements CellEditorProvid IConfigurationElement[] config = EclipseUtil.getConfigurationElementsFor(EXTENSION_POINT_ID); for (IConfigurationElement configurationElement : config) { try { - Object contribution = configurationElement.createExecutableExtension("class"); + Object contribution = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$ if (contribution instanceof ICellEditorProvider) { cache.add((ICellEditorProvider) contribution); } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/EMFCoreUtil.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/EMFCoreUtil.java index 37593ceda1..c2f985ad25 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/EMFCoreUtil.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/EMFCoreUtil.java @@ -35,7 +35,7 @@ import org.eclipse.sirius.ext.base.Options; */ public final class EMFCoreUtil { - private static final String EMPTY_STRING = ""; + private static final String EMPTY_STRING = ""; //$NON-NLS-1$ /** * Avoid instantiation diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/SessionCallBackWithUI.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/SessionCallBackWithUI.java index 53f2de8751..126b0154b4 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/SessionCallBackWithUI.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/util/SessionCallBackWithUI.java @@ -23,6 +23,6 @@ public class SessionCallBackWithUI extends AbstractSWTCallback { @Override protected String getVariableNameForRepresentation() { - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/ContextMenuFiller.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/ContextMenuFiller.java index 2d4946195f..366985c092 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/ContextMenuFiller.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/ContextMenuFiller.java @@ -104,25 +104,25 @@ public class ContextMenuFiller implements IMenuListener, IMenuListener2 { private static final String NEW_REPRESENTATION_MENU = "New Representation"; - private static final String NEW_REPRESENTATION_MENU_ID = "menu.viewpoint.new.representation"; + private static final String NEW_REPRESENTATION_MENU_ID = "menu.viewpoint.new.representation"; //$NON-NLS-1$ - private static final String SESSION_MANAGEMENT_SEPARATOR = "group.viewpoint.session"; + private static final String SESSION_MANAGEMENT_SEPARATOR = "group.viewpoint.session"; //$NON-NLS-1$ - private static final String REPRESENTATION_MANAGEMENT_SEPARATOR = "group.viewpoint.representation"; + private static final String REPRESENTATION_MANAGEMENT_SEPARATOR = "group.viewpoint.representation"; //$NON-NLS-1$ - private static final String SEMANTIC_MANAGEMENT_SEPARATOR = "group.viewpoint.semantic"; + private static final String SEMANTIC_MANAGEMENT_SEPARATOR = "group.viewpoint.semantic"; //$NON-NLS-1$ - private static final String SESSION_SEPARATOR = "group.viewpoint"; + private static final String SESSION_SEPARATOR = "group.viewpoint"; //$NON-NLS-1$ - private static final String GROUP_NEW = "group.new"; + private static final String GROUP_NEW = "group.new"; //$NON-NLS-1$ - private static final String GROUP_PORT = "group.port"; + private static final String GROUP_PORT = "group.port"; //$NON-NLS-1$ - private static final String GROUP_OPEN = "group.open"; + private static final String GROUP_OPEN = "group.open"; //$NON-NLS-1$ - private static final String GROUP_REORGANIZE = "group.reorganize"; + private static final String GROUP_REORGANIZE = "group.reorganize"; //$NON-NLS-1$ - private static final String GROUP_EDIT = "group.edit"; + private static final String GROUP_EDIT = "group.edit"; //$NON-NLS-1$ private ILabelProvider labelProvider; @@ -561,12 +561,12 @@ public class ContextMenuFiller implements IMenuListener, IMenuListener2 { } private Action buildCreateRepresentationAction(final Session session) { - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/addRepresentation.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/addRepresentation.gif"); //$NON-NLS-1$ return new CreateRepresentationFromSessionAction(session, descriptor); } private Action buildCloseSessionAction(final List<Session> selection) { - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/close.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/close.gif"); //$NON-NLS-1$ CloseSessionsAction closeSessionsAction = new CloseSessionsAction("Close"); closeSessionsAction.setImageDescriptor(descriptor); closeSessionsAction.selectionChanged(new StructuredSelection(selection)); @@ -574,7 +574,7 @@ public class ContextMenuFiller implements IMenuListener, IMenuListener2 { } private Action buildSaveSessionAction(final List<Session> selection) { - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/save.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/save.gif"); //$NON-NLS-1$ return new Action("Save", descriptor) { @Override public void run() { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/DeleteRepresentationAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/DeleteRepresentationAction.java index e368c3944d..a9826b0321 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/DeleteRepresentationAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/DeleteRepresentationAction.java @@ -63,7 +63,7 @@ public class DeleteRepresentationAction extends Action { * the representations to delete */ public DeleteRepresentationAction(Collection<DRepresentation> representations) { - super("Delete", AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/delete.gif")); + super("Delete", AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/delete.gif")); //$NON-NLS-2$ this.selectedRepresentations = representations; // Disable the action if the selection is not valid diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/ExtractRepresentationAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/ExtractRepresentationAction.java index 157692dbf3..f40a03c39c 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/ExtractRepresentationAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/ExtractRepresentationAction.java @@ -55,7 +55,7 @@ public class ExtractRepresentationAction extends Action { this.session = session; this.representations = selection; - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/export.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/export.gif"); //$NON-NLS-1$ this.setImageDescriptor(descriptor); this.setText("Extract to ." + SiriusUtil.SESSION_RESOURCE_EXTENSION + " file ..."); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/MoveRepresentationAction.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/MoveRepresentationAction.java index 99b212b403..e4b6feb605 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/MoveRepresentationAction.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/action/MoveRepresentationAction.java @@ -60,7 +60,7 @@ public class MoveRepresentationAction extends Action { this.session = session; this.representations = selection; - final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/forward.gif"); + final ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/others/forward.gif"); //$NON-NLS-1$ this.setImageDescriptor(descriptor); this.setText("move to " + targetAnalysis.eResource().getURI().toString()); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/AnalysisResourceItemImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/AnalysisResourceItemImpl.java index 611cef4d5b..330106a28b 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/AnalysisResourceItemImpl.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/AnalysisResourceItemImpl.java @@ -33,7 +33,7 @@ import com.google.common.collect.Lists; */ public class AnalysisResourceItemImpl implements AnalysisResourceItem { - private static final String SESSION_IMAGE = "icons/obj16/SiriusFile.gif"; + private static final String SESSION_IMAGE = "icons/obj16/SiriusFile.gif"; //$NON-NLS-1$ private final Session session; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ProjectDependenciesItemImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ProjectDependenciesItemImpl.java index 35c10298e4..4f0049026d 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ProjectDependenciesItemImpl.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/item/ProjectDependenciesItemImpl.java @@ -107,7 +107,7 @@ public class ProjectDependenciesItemImpl implements ProjectDependenciesItem { } public Image getImage() { - return SiriusEditPlugin.getPlugin().getBundledImage("icons/obj16/ProjectDependencies.gif"); + return SiriusEditPlugin.getPlugin().getBundledImage("icons/obj16/ProjectDependencies.gif"); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/ModelingProjectFileQuery.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/ModelingProjectFileQuery.java index b9cecc9891..de815193a8 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/ModelingProjectFileQuery.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/ModelingProjectFileQuery.java @@ -71,7 +71,7 @@ public class ModelingProjectFileQuery { public boolean isPotentialSemanticResource() { boolean fileToIgnore = isRepresentationsModel(file) || isVsmModel(file); if (!fileToIgnore) { - fileToIgnore = file.isDerived(IResource.CHECK_ANCESTORS) || file.getFullPath().toString().contains("/.svn/") || isRepairBackupFile(); + fileToIgnore = file.isDerived(IResource.CHECK_ANCESTORS) || file.getFullPath().toString().contains("/.svn/") || isRepairBackupFile(); //$NON-NLS-1$ } return !fileToIgnore; } @@ -81,7 +81,7 @@ public class ModelingProjectFileQuery { * vsm and representations resources. */ private boolean isRepairBackupFile() { - if ("old".equals(file.getFileExtension())) { + if ("old".equals(file.getFileExtension())) { //$NON-NLS-1$ IPath repairedPath = file.getFullPath().removeFileExtension(); // If this is a repaired file, removing .old will make the old // extension to become the file extension. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/OpenRepresentationsFileJob.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/OpenRepresentationsFileJob.java index e567f1858b..57d921f6b4 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/OpenRepresentationsFileJob.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/OpenRepresentationsFileJob.java @@ -68,7 +68,7 @@ public class OpenRepresentationsFileJob extends AbstractRepresentationsFileJob { */ public static final String JOB_LABEL = "Loading models"; - private static final String QUOTE = "\""; + private static final String QUOTE = "\""; //$NON-NLS-1$ /** * The list of representations files to load. This list is exclusive with @@ -178,7 +178,7 @@ public class OpenRepresentationsFileJob extends AbstractRepresentationsFileJob { SubProgressMonitor getRepresentationsFilesMonitor = new SubProgressMonitor(monitor, 1); try { - getRepresentationsFilesMonitor.beginTask("", modelingProjects.size()); + getRepresentationsFilesMonitor.beginTask("", modelingProjects.size()); //$NON-NLS-1$ for (ModelingProject modelingProject : modelingProjects) { Option<URI> optionalMainSessionFileURI = modelingProject.getMainRepresentationsFileURI(new SubProgressMonitor(getRepresentationsFilesMonitor, 1), false, false); if (optionalMainSessionFileURI.some()) { @@ -193,7 +193,7 @@ public class OpenRepresentationsFileJob extends AbstractRepresentationsFileJob { } SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 8); try { - subMonitor.beginTask("", 100 * representationsFilesURIs.size()); + subMonitor.beginTask("", 100 * representationsFilesURIs.size()); //$NON-NLS-1$ for (URI representationsFileURI : representationsFilesURIs) { // Clean existing marker if exists IProject project = null; @@ -261,7 +261,7 @@ public class OpenRepresentationsFileJob extends AbstractRepresentationsFileJob { * @return The error message. */ protected String logLoadingProblem(IProject project, URI representationsFileURI, Exception exception) { - String message = ""; + String message = ""; //$NON-NLS-1$ if (project != null) { boolean isModelingProject = ModelingProject.hasModelingProjectNature(project); if (isModelingProject) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/manager/ModelingProjectManagerImpl.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/manager/ModelingProjectManagerImpl.java index df6e65b5bb..0b9be21f19 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/manager/ModelingProjectManagerImpl.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/manager/ModelingProjectManagerImpl.java @@ -66,7 +66,7 @@ import com.google.common.collect.Sets; public class ModelingProjectManagerImpl implements ModelingProjectManager { /** The old Viewpoint nature id. */ - private static final String VIEWPOINT_MODELING_PROJECT_NATURE_ID = "fr.obeo.dsl.viewpoint.nature.modelingproject"; + private static final String VIEWPOINT_MODELING_PROJECT_NATURE_ID = "fr.obeo.dsl.viewpoint.nature.modelingproject"; //$NON-NLS-1$ private final SessionManagerListener sessionManagerListener = new SessionManagerListener.Stub() { /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java index ab3c70d677..588faaf139 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/model/ModelingModelProvider.java @@ -131,7 +131,7 @@ public class ModelingModelProvider extends ModelProvider { IProject project = iterator.next(); result.append(project.getName()); if (iterator.hasNext()) { - result.append(", "); + result.append(", "); //$NON-NLS-1$ } } return result.toString(); @@ -152,7 +152,7 @@ public class ModelingModelProvider extends ModelProvider { IFile file = iterator.next(); result.append(file.getProject().getName()); if (iterator.hasNext()) { - result.append(", "); + result.append(", "); //$NON-NLS-1$ } } return result.toString(); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerDescriptor.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerDescriptor.java index c50ab01be4..34947731f6 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerDescriptor.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerDescriptor.java @@ -27,7 +27,7 @@ public class ModelingProjectResourceListenerDescriptor { /** * Name of the attribute corresponding to the contributed class's path. */ - public static final String CONTRIBUTED_CLASS_NAME = "class"; + public static final String CONTRIBUTED_CLASS_NAME = "class"; //$NON-NLS-1$ /** * Configuration element of this descriptor . diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerRegistry.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerRegistry.java index ae9db2bc44..c981b8424c 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerRegistry.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/modelingproject/resourcelistener/ModelingProjectResourceListenerRegistry.java @@ -30,9 +30,9 @@ import com.google.common.collect.Lists; */ public final class ModelingProjectResourceListenerRegistry { - private static final String EXTENSION_POINT = "org.eclipse.sirius.ui.modelingprojectresourcelistener"; + private static final String EXTENSION_POINT = "org.eclipse.sirius.ui.modelingprojectresourcelistener"; //$NON-NLS-1$ - private static final Object TAG_EXTENSION = "resourcelistener"; + private static final Object TAG_EXTENSION = "resourcelistener"; //$NON-NLS-1$ /** * The list of all contributed {@link IModelingProjectResourceListener}s. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java index ce94895232..dee81dddf5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/OpenSessionOnExpandListener.java @@ -131,7 +131,7 @@ public class OpenSessionOnExpandListener implements ITreeViewerListener { if (viewer != null) { Method method = null; try { - method = viewer.getClass().getMethod("isBusy"); + method = viewer.getClass().getMethod("isBusy"); //$NON-NLS-1$ } catch (SecurityException e) { // No method, no data } catch (NoSuchMethodException e) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java index d075717a57..e4fa1fe21e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java @@ -708,7 +708,7 @@ public class SiriusCommonContentProvider implements ICommonContentProvider { if (myViewer != null) { Method method = null; try { - method = myViewer.getClass().getMethod("isBusy"); + method = myViewer.getClass().getMethod("isBusy"); //$NON-NLS-1$ } catch (SecurityException e) { // No method, no data } catch (NoSuchMethodException e) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java index b4d7ecc1da..e7d7b9846e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java @@ -69,7 +69,7 @@ public class SiriusCommonLabelProvider implements ICommonLabelProvider, IColorPr */ public static final ImageDescriptor SIRIUS_MODELING_OVERLAY_DESC = AbstractUIPlugin.imageDescriptorFromPlugin(SiriusEditPlugin.ID, "/icons/full/ovr16/SessionDecorator.gif"); //$NON-NLS-1$; - private static final String DIRTY = "*"; + private static final String DIRTY = "*"; //$NON-NLS-1$ private ILabelProvider sessionLabelProvider; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/PatternFilter.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/PatternFilter.java index d6b9cafa24..f27cd075c6 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/PatternFilter.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/PatternFilter.java @@ -60,7 +60,7 @@ public class PatternFilter extends ViewerFilter { * The pattern filter declared in plugin.xml that must be used by the * CommonFilteredTree. */ - public static final String ID = "org.eclipse.sirius.ui.commonFilter.pattern"; + public static final String ID = "org.eclipse.sirius.ui.commonFilter.pattern"; //$NON-NLS-1$ private static final Object[] EMPTY = new Object[0]; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/RepresentationDescriptionWithoutRepresentationCommonFilter.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/RepresentationDescriptionWithoutRepresentationCommonFilter.java index 7640c6ced6..8881ee44cb 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/RepresentationDescriptionWithoutRepresentationCommonFilter.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/filter/RepresentationDescriptionWithoutRepresentationCommonFilter.java @@ -25,7 +25,7 @@ public class RepresentationDescriptionWithoutRepresentationCommonFilter extends /** * The ID of this filter (used in plugin.xml). */ - public static final String ID = "org.eclipse.sirius.ui.commonFilter.representation.description"; + public static final String ID = "org.eclipse.sirius.ui.commonFilter.representation.description"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java index f543a57e64..c10a4bd281 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/interpreterview/DesignerInterpreterView.java @@ -98,9 +98,9 @@ public class DesignerInterpreterView extends ViewPart implements InterpreterView ITreeContentProvider contentProvider; - private String contentAssistBinding = "org.eclipse.ui.edit.text.contentAssist.proposals"; + private String contentAssistBinding = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$ - private String variableTag = "$"; + private String variableTag = "$"; //$NON-NLS-1$ /* user interface */ private Composite top; @@ -441,7 +441,7 @@ public class DesignerInterpreterView extends ViewPart implements InterpreterView final Resource resource = current.eResource(); if (resource != null) { final String path = resource.getURI().toPlatformString(true); - interpreter.setProperty("file", path); + interpreter.setProperty("file", path); //$NON-NLS-1$ } final long now = new Date().getTime(); @@ -449,7 +449,7 @@ public class DesignerInterpreterView extends ViewPart implements InterpreterView final Object result = interpreter.evaluate(current, acceleoExpression.getText()); final long ellapseTime = new Date().getTime() - now; final int numberOfResults = handleExpressionResult(result); - final DecimalFormat decimalFormat = new DecimalFormat("###,###,###.###"); + final DecimalFormat decimalFormat = new DecimalFormat("###,###,###.###"); //$NON-NLS-1$ this.interpreterForm.setMessage("Evaluation successful. Number of returned elements : " + numberOfResults + ". Time to evaluate : " + decimalFormat.format(ellapseTime / (double) 1000) + " second(s)", IMessageProvider.INFORMATION); } catch (final EvaluationException e) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java index 22f3a7f87e..d9f0f33d0e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/ModelExplorerView.java @@ -72,7 +72,7 @@ public class ModelExplorerView extends CommonNavigator implements IModelExplorer private CTabFolder tabFolder; - private String initialSelection = ""; + private String initialSelection = ""; //$NON-NLS-1$ private Map<CTabItem, TabInfo> tabItems = Maps.newLinkedHashMap(); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/CommonNavigatorTab.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/CommonNavigatorTab.java index b22011bf47..380d634cd1 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/CommonNavigatorTab.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/CommonNavigatorTab.java @@ -38,11 +38,11 @@ import com.google.common.collect.Sets; public class CommonNavigatorTab implements IModelExplorerTabExtension { /** the id of the tab. */ - public static final String TAB_ID = "navigator"; + public static final String TAB_ID = "navigator"; //$NON-NLS-1$ private static final String MODEL_EXPLORER_STRUCTURE_TAB_NAME = "Navigator"; - private static final String MODEL_EXPLORER_STRUCTURE_TAB_ICON = "icons/full/others/structure.gif"; + private static final String MODEL_EXPLORER_STRUCTURE_TAB_ICON = "icons/full/others/structure.gif"; //$NON-NLS-1$ private ModelExplorerView view; diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/ModelExplorerTabDescriptor.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/ModelExplorerTabDescriptor.java index 6fb9bc964b..cbb8d248a8 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/ModelExplorerTabDescriptor.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/extension/tab/ModelExplorerTabDescriptor.java @@ -31,18 +31,18 @@ public class ModelExplorerTabDescriptor { /** * Name of the attribute corresponding to the contributed class's path. */ - public static final String MODEL_EXPLORER_TAB_CLASS_NAME = "class"; + public static final String MODEL_EXPLORER_TAB_CLASS_NAME = "class"; //$NON-NLS-1$ /** * Name of the attribute corresponding to the contributed icon's relative * path. */ - public static final String MODEL_EXPLORER_TAB_ICON = "icon"; + public static final String MODEL_EXPLORER_TAB_ICON = "icon"; //$NON-NLS-1$ /** * Name of the attribute corresponding to the contributed id. */ - public static final String MODEL_EXPLORER_TAB_ID = "icon"; + public static final String MODEL_EXPLORER_TAB_ID = "icon"; //$NON-NLS-1$ /** * Configuration element of this descriptor . diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/property/SiriusPropertiesLabelProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/property/SiriusPropertiesLabelProvider.java index 461fe128e2..fe8787706e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/property/SiriusPropertiesLabelProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/modelexplorer/property/SiriusPropertiesLabelProvider.java @@ -39,7 +39,7 @@ public class SiriusPropertiesLabelProvider extends DecoratingLabelProvider { * {@inheritDoc} */ public String getText(Object element) { - String text = ""; + String text = ""; //$NON-NLS-1$ EObject selected = adapt(element); if (selected != null && selected.eResource() != null) { if (selected instanceof DSemanticDecorator && ((DSemanticDecorator) selected).getTarget() != null) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/CreateOrAddResourceWizard.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/CreateOrAddResourceWizard.java index 3ddb49fe42..e12928a4a7 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/CreateOrAddResourceWizard.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/CreateOrAddResourceWizard.java @@ -193,10 +193,10 @@ public class CreateOrAddResourceWizard extends Wizard implements IAddModelDepend selectionPage = new CreateOrAddResourceWizardPage("selectionPage"); //$NON-NLS-1$ selectionPage.setTitle(WIZARD_TITLE); addPage(selectionPage); - metamodelPage = new SelectMetamodelWizardPage("metamodelPage", new String[] { "ecore" }, false); //$NON-NLS-1$ $NON-NLS-2$ + metamodelPage = new SelectMetamodelWizardPage("metamodelPage", new String[] { "ecore" }, false); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$ metamodelPage.setTitle(WIZARD_TITLE); addPage(metamodelPage); - initialObjectPage = new GenericInitialObjectPage("initialObjectPage"); + initialObjectPage = new GenericInitialObjectPage("initialObjectPage"); //$NON-NLS-1$ initialObjectPage.setTitle(WIZARD_TITLE); initialObjectPage.setDescription("Select the root instance type and the file encoding"); addPage(initialObjectPage); @@ -244,7 +244,7 @@ public class CreateOrAddResourceWizard extends Wizard implements IAddModelDepend @Override protected void execute(final IProgressMonitor monitor) { try { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ /* Create a resource set */ final ResourceSet resourceSet = new ResourceSetImpl(); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/ModelingProjectWizard.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/ModelingProjectWizard.java index b817b3bb83..82594f0563 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/ModelingProjectWizard.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/ModelingProjectWizard.java @@ -97,7 +97,7 @@ public class ModelingProjectWizard extends Wizard implements INewWizard { */ public void init(final IWorkbench wkbch, final IStructuredSelection sel) { setWindowTitle("New Modeling Project"); - setDefaultPageImageDescriptor(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/wizban/banner_modeling_project.gif")); + setDefaultPageImageDescriptor(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/wizban/banner_modeling_project.gif")); //$NON-NLS-1$ } /** @@ -119,7 +119,7 @@ public class ModelingProjectWizard extends Wizard implements INewWizard { @Override public void addPages() { newProjectPage = new NewModelingProjectCreationWizardPage(SiriusEditPlugin.getPlugin().getString("_UI_ModelingProjectWizard_label")); //$NON-NLS-1$ - newProjectPage.setInitialProjectName(""); + newProjectPage.setInitialProjectName(""); //$NON-NLS-1$ newProjectPage.setTitle(SiriusEditPlugin.getPlugin().getString("_UI_ModelingProjectWizard_label")); //$NON-NLS-1$ newProjectPage.setDescription(SiriusEditPlugin.getPlugin().getString("_UI_ModelingProjectWizard_description")); //$NON-NLS-1$ addPage(newProjectPage); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/NewSessionWizard.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/NewSessionWizard.java index 3d8544205e..8aec3265db 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/NewSessionWizard.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/NewSessionWizard.java @@ -130,7 +130,7 @@ public class NewSessionWizard extends Wizard implements INewWizard { this.workbench = w; setWindowTitle("New Representations File"); setNeedsProgressMonitor(true); - setDefaultPageImageDescriptor(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/wizban/banner_aird.gif")); + setDefaultPageImageDescriptor(SiriusEditPlugin.Implementation.getBundledImageDescriptor("icons/wizban/banner_aird.gif")); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/GenericInitialObjectPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/GenericInitialObjectPage.java index 5ecda3b48b..e6b5d27693 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/GenericInitialObjectPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/GenericInitialObjectPage.java @@ -129,12 +129,12 @@ public class GenericInitialObjectPage extends WizardPage { protected Collection<String> getEncodings() { if (encodings == null) { encodings = new ArrayList<String>(); - encodings.add("UTF-8"); - encodings.add("ASCII"); - encodings.add("UTF-16"); - encodings.add("UTF-16BE"); - encodings.add("UTF-16LE"); - encodings.add("ISO-8859-1"); + encodings.add("UTF-8"); //$NON-NLS-1$ + encodings.add("ASCII"); //$NON-NLS-1$ + encodings.add("UTF-16"); //$NON-NLS-1$ + encodings.add("UTF-16BE"); //$NON-NLS-1$ + encodings.add("UTF-16LE"); //$NON-NLS-1$ + encodings.add("ISO-8859-1"); //$NON-NLS-1$ } return encodings; } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java index 0122d2d37e..cf2ea7cc70 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/NewModelingProjectCreationWizardPage.java @@ -142,7 +142,7 @@ public class NewModelingProjectCreationWizardPage extends WizardNewProjectCreati } private static boolean isMacOrWindowsOS() { - return System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac"); + return System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ // return false; } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectAnalysisFilePage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectAnalysisFilePage.java index f9dfc4e080..e272b8926c 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectAnalysisFilePage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectAnalysisFilePage.java @@ -47,7 +47,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider; */ public class SelectAnalysisFilePage extends WizardPage { - private static final String SEPARATOR = "/"; + private static final String SEPARATOR = "/"; //$NON-NLS-1$ /** * the tree viewer. diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectMetamodelWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectMetamodelWizardPage.java index ab1f592e68..78f21d4c3b 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectMetamodelWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SelectMetamodelWizardPage.java @@ -247,11 +247,11 @@ public class SelectMetamodelWizardPage extends WizardPage { index = bestType(index, nameForModel, 1); index = bestType(index, nameForModel, 2); - final String nameForRoot = "root"; + final String nameForRoot = "root"; //$NON-NLS-1$ index = bestType(index, nameForRoot, 0); index = bestType(index, nameForRoot, 1); index = bestType(index, nameForRoot, 2); - final String nameForPackage = "package"; + final String nameForPackage = "package"; //$NON-NLS-1$ index = bestType(index, nameForPackage, 0); index = bestType(index, nameForPackage, 1); index = bestType(index, nameForPackage, 2); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SemanticElementSelectionWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SemanticElementSelectionWizardPage.java index 09b63766ee..726b1df596 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SemanticElementSelectionWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SemanticElementSelectionWizardPage.java @@ -244,7 +244,7 @@ public class SemanticElementSelectionWizardPage extends WizardPage { * enabled it also makes the tree pre-select the first matching * node, saving the user a manual selection in many cases. */ - tree.getFilterControl().setText("*"); + tree.getFilterControl().setText("*"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionFileCreationWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionFileCreationWizardPage.java index 993a586ba6..d179200844 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionFileCreationWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionFileCreationWizardPage.java @@ -49,7 +49,7 @@ public class SessionFileCreationWizardPage extends SessionResourceCreationWizard * {@inheritDoc} */ protected String getNoselectionFileName() { - return "representations"; + return "representations"; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionResourceCreationWizardPage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionResourceCreationWizardPage.java index cabe1227ec..2c4670c067 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionResourceCreationWizardPage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/wizards/pages/SessionResourceCreationWizardPage.java @@ -113,7 +113,7 @@ public class SessionResourceCreationWizardPage extends WizardNewFileCreationPage @Override public void createControl(final Composite parent) { super.createControl(parent); - setFileName(getDefaultFileName() + "." + getExtension()); + setFileName(getDefaultFileName() + "." + getExtension()); //$NON-NLS-1$ setPageComplete(validatePage()); } @@ -130,7 +130,7 @@ public class SessionResourceCreationWizardPage extends WizardNewFileCreationPage } // Validate that entered extension is the expected one. final String extension = getExtension(); - if (extension != null && !getFilePath().toString().endsWith("." + extension)) { + if (extension != null && !getFilePath().toString().endsWith("." + extension)) { //$NON-NLS-1$ setErrorMessage("The file extension is wrong. It should be " + extension); result = false; } diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java index 3519d0c9e6..a1851b04df 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/SyncStatus.java @@ -45,7 +45,7 @@ public enum SyncStatus implements Enumerator { * @generated * @ordered */ - SYNC(1, "sync", "sync"); //$NON-NLS-1$ + SYNC(1, "sync", "sync"); //$NON-NLS-1$ //$NON-NLS-2$ /** * The '<em><b>Dirty</b></em>' literal value. <!-- begin-user-doc --> diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java index b3cacf38d8..ab6c9213a0 100644 --- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java +++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/tool/impl/PaneBasedSelectionWizardDescriptionImpl.java @@ -151,7 +151,7 @@ public class PaneBasedSelectionWizardDescriptionImpl extends AbstractToolDescrip * @generated * @ordered */ - protected static final String WINDOW_TITLE_EDEFAULT = "Selection Wizard"; + protected static final String WINDOW_TITLE_EDEFAULT = "Selection Wizard"; //$NON-NLS-1$ /** * The cached value of the '{@link #getWindowTitle() <em>Window Title</em>}' diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/AbstractExternalJavaAction.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/AbstractExternalJavaAction.java index a1a6f1e4ba..bae4be4d1a 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/AbstractExternalJavaAction.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/AbstractExternalJavaAction.java @@ -80,7 +80,7 @@ public abstract class AbstractExternalJavaAction implements IExternalJavaAction } else if (value == null && !required) { result = null; } else { - String typeName = (value == null) ? "null" : ("a " + value.getClass().getSimpleName()); + String typeName = (value == null) ? "null" : ("a " + value.getClass().getSimpleName()); //$NON-NLS-1$ throw new IllegalArgumentException("Type error: parameter '" + name + "' should be a " + type.getSimpleName() + " but is " + typeName); } return result; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/MoveElementInListAction.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/MoveElementInListAction.java index f39f178593..0dc3577ce6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/MoveElementInListAction.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/MoveElementInListAction.java @@ -47,21 +47,17 @@ import com.google.common.base.Preconditions; */ public class MoveElementInListAction extends AbstractExternalJavaAction { - /** - * {@inheritDoc} - */ + @Override public boolean canExecute(Collection<? extends EObject> selections) { return selections.size() == 1; } - /** - * {@inheritDoc} - */ + @Override public void execute(Collection<? extends EObject> selections, Map<String, Object> parameters) { - EObject element = getParameter(parameters, "element", EObject.class); - EObject owner = getParameter(parameters, "referenceOwner", EObject.class); - String refName = getParameter(parameters, "referenceName", String.class); - EObject pred = getOptionalParameter(parameters, "predecessor", EObject.class); + EObject element = getParameter(parameters, "element", EObject.class); //$NON-NLS-1$ + EObject owner = getParameter(parameters, "referenceOwner", EObject.class); //$NON-NLS-1$ + String refName = getParameter(parameters, "referenceName", String.class); //$NON-NLS-1$ + EObject pred = getOptionalParameter(parameters, "predecessor", EObject.class); //$NON-NLS-1$ if (pred != null) { Preconditions.checkArgument(element != pred, "'element' and 'predecessor' must be different."); } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/PrintInterpreterVariablesAction.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/PrintInterpreterVariablesAction.java index 0dbaf5ed5b..4a9ad61abf 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/PrintInterpreterVariablesAction.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/action/PrintInterpreterVariablesAction.java @@ -40,9 +40,9 @@ import com.google.common.collect.Ordering; * @author pcdavid */ public class PrintInterpreterVariablesAction extends AbstractExternalJavaAction { - private static final String TITLE_PARAM = "title"; + private static final String TITLE_PARAM = "title"; //$NON-NLS-1$ - private static final String ENABLED_PARAM = "enabled"; + private static final String ENABLED_PARAM = "enabled"; //$NON-NLS-1$ private static final String DEFAULT_TITLE = "<no title>"; @@ -75,7 +75,7 @@ public class PrintInterpreterVariablesAction extends AbstractExternalJavaAction IInterpreter interpreter = InterpreterUtil.getInterpreter(context); SortedMap<String, Object> allVariables = Maps.newTreeMap(Ordering.natural()); allVariables.putAll(interpreter.getVariables()); - allVariables.put("self", context); + allVariables.put("self", context); //$NON-NLS-1$ return allVariables; } @@ -94,11 +94,11 @@ public class PrintInterpreterVariablesAction extends AbstractExternalJavaAction System.out.println("[" + title + "] variables available:"); int i = 1; for (Map.Entry<String, Object> variable : allVariables.entrySet()) { - System.out.print(" " + i++ + ". " + variable.getKey()); + System.out.print(" " + i++ + ". " + variable.getKey()); //$NON-NLS-1$ //$NON-NLS-2$ for (int j = 0; j < (maxLength - variable.getKey().length()); j++) { - System.out.print(" "); + System.out.print(" "); //$NON-NLS-1$ } - System.out.println(": " + variable.getValue()); + System.out.println(": " + variable.getValue()); //$NON-NLS-1$ } System.out.println(); // CHECKSTYLE:ON diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/color/RGBValuesProvider.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/color/RGBValuesProvider.java index fc1658f799..4292fcb4e0 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/color/RGBValuesProvider.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/color/RGBValuesProvider.java @@ -43,7 +43,7 @@ public class RGBValuesProvider { */ private static final Predicate<ColorStep> WELL_DEFINED_STEP = new Predicate<ColorStep>() { public boolean apply(ColorStep input) { - return input.getAssociatedColor() != null && input.getAssociatedValue() != null && !"".equals(input.getAssociatedValue()); + return input.getAssociatedColor() != null && input.getAssociatedValue() != null && !"".equals(input.getAssociatedValue()); //$NON-NLS-1$ } }; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ISiriusComponent.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ISiriusComponent.java index 63e468a1e6..cd38dff2f2 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ISiriusComponent.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ISiriusComponent.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.Plugin; public interface ISiriusComponent { /** The extension point ID. */ - String ID = "org.eclipse.sirius.componentization"; + String ID = "org.eclipse.sirius.componentization"; //$NON-NLS-1$ /** The class attribute. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** The class. */ Class<Plugin> CLASS_TO_EXTEND = Plugin.class; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ViewpointRegistryImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ViewpointRegistryImpl.java index 66582a4f6c..02f4ee43f9 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ViewpointRegistryImpl.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/componentization/ViewpointRegistryImpl.java @@ -537,7 +537,7 @@ public class ViewpointRegistryImpl extends ViewpointRegistry { } private List<IFile> collectFilesContainingViewpoints() { - return EclipseUtil.getFilesFromWorkspace(null, "." + SiriusUtil.DESCRIPTION_MODEL_EXTENSION); + return EclipseUtil.getFilesFromWorkspace(null, "." + SiriusUtil.DESCRIPTION_MODEL_EXTENSION); //$NON-NLS-1$ } private void mapToSiriusProtocol(Collection<Viewpoint> viewpoints) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/delete/IDeleteHook.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/delete/IDeleteHook.java index 3860fb63e4..440a7e0d74 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/delete/IDeleteHook.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/delete/IDeleteHook.java @@ -25,13 +25,13 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator; public interface IDeleteHook { /** The extension point ID. */ - String ID = "org.eclipse.sirius.deleteHook"; + String ID = "org.eclipse.sirius.deleteHook"; //$NON-NLS-1$ /** The class attribute. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** The class attribute. */ - String ID_ATTRIBUTE = "id"; + String ID_ATTRIBUTE = "id"; //$NON-NLS-1$ /** * This method will be called before the deletion command execution. It is diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/DialectManager.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/DialectManager.java index cbf4ac280f..621c2ab4b6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/DialectManager.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/DialectManager.java @@ -27,12 +27,12 @@ public interface DialectManager extends DialectServices { /** * Dialect manager extension point ID. */ - String ID = "org.eclipse.sirius.dialect"; + String ID = "org.eclipse.sirius.dialect"; //$NON-NLS-1$ /** * Extension point attribute for the dialect class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Enable a new dialect. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/CopyRepresentationCommand.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/CopyRepresentationCommand.java index 06ee0c23f4..f51e6714d3 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/CopyRepresentationCommand.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/CopyRepresentationCommand.java @@ -69,7 +69,7 @@ public class CopyRepresentationCommand extends RecordingCommand { if (representations.size() == 1) { return newName; } else { - return newName + " " + representation.getName(); + return newName + " " + representation.getName(); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/RefreshRepresentationsCommand.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/RefreshRepresentationsCommand.java index e3f45ff826..511647a304 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/RefreshRepresentationsCommand.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/command/RefreshRepresentationsCommand.java @@ -106,9 +106,6 @@ public class RefreshRepresentationsCommand extends RecordingCommand { this(domain, fullRefresh, monitor, Lists.newArrayList(representationsToRefresh)); } - /** - * {@inheritDoc} - */ @Override protected void doExecute() { if (representations.size() == 0) { @@ -134,11 +131,6 @@ public class RefreshRepresentationsCommand extends RecordingCommand { return safeRefresh; } - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.common.command.AbstractCommand#canExecute() - */ @Override public boolean canExecute() { return representations.size() != 0; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java index 271d5f62bc..3c52069c75 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/dialect/description/AbstractInterpretedExpressionQuery.java @@ -72,7 +72,7 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted * The source tag used in the meta-model for all EAnnotations concerning the * variables available to interpreted expressions. */ - protected static final String VARIABLES_ANNOTATION_SOURCE = "http://www.eclipse.org/sirius/interpreted/expression/variables"; + protected static final String VARIABLES_ANNOTATION_SOURCE = "http://www.eclipse.org/sirius/interpreted/expression/variables"; //$NON-NLS-1$ /** * The character used in the documentation annotation of variables to @@ -86,7 +86,7 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted * The key used in {@link #VARIABLES_ANNOTATION_SOURCE} annotations of * variable to specify the type of that variable. */ - protected static final String VARIABLE_TYPE_KEY = "type"; + protected static final String VARIABLE_TYPE_KEY = "type"; //$NON-NLS-1$ /** * The target containing the InterpretedExpression (NodeMapping, @@ -283,7 +283,7 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted * the containerView variable is accessible in any Model * operation which is a child of the ToolDescription. */ - availableVariables.put("containerView", VariableType.fromString("viewpoint.DSemanticDecorator")); + availableVariables.put("containerView", VariableType.fromString("viewpoint.DSemanticDecorator")); //$NON-NLS-1$ //$NON-NLS-2$ } addVariablesFromToolContext(operationContext); } @@ -293,7 +293,7 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted * the containerView variable is accessible in the "precondition" * feature of the ToolDescription. See GenericToolCommandBuilder. */ - availableVariables.put("containerView", VariableType.fromString("viewpoint.DSemanticDecorator")); + availableVariables.put("containerView", VariableType.fromString("viewpoint.DSemanticDecorator")); //$NON-NLS-1$ //$NON-NLS-2$ } if (ToolPackage.Literals.ABSTRACT_TOOL_DESCRIPTION__ELEMENTS_TO_SELECT.equals(feature)) { @@ -617,16 +617,16 @@ public abstract class AbstractInterpretedExpressionQuery implements IInterpreted * the set of variables definition to which to append. */ protected void appendEditMaskVariables(EditMaskVariables mask, Map<String, Collection<VariableType>> definitions) { - Pattern p = Pattern.compile("\\{\\d\\}"); + Pattern p = Pattern.compile("\\{\\d\\}"); //$NON-NLS-1$ Matcher m = p.matcher(mask.getMask()); while (m.find()) { String group = m.group(); String index = group.substring(1, group.length() - 1); // Old Acceleo 2-style variables. - addDefinition(definitions, index, "String"); + addDefinition(definitions, index, "String"); //$NON-NLS-1$ // New variable names which should be legal in all query // languages, including Acceleo 3. - addDefinition(definitions, "arg" + index, "String"); + addDefinition(definitions, "arg" + index, "String"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorManager.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorManager.java index 4a72695f71..25c782f66e 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorManager.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/extender/MetamodelDescriptorManager.java @@ -30,12 +30,12 @@ public interface MetamodelDescriptorManager { /** * Metamodel manager extension point ID. */ - String ID = "org.eclipse.sirius.mmdescriptor"; + String ID = "org.eclipse.sirius.mmdescriptor"; //$NON-NLS-1$ /** * Extension point attribute for the dialect class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Return the list of provided MetamodelDescriptors from the selected diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/featureextensions/FeatureExtensionsManager.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/featureextensions/FeatureExtensionsManager.java index 12d23e7b12..ebad6b529d 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/featureextensions/FeatureExtensionsManager.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/featureextensions/FeatureExtensionsManager.java @@ -26,12 +26,12 @@ public interface FeatureExtensionsManager extends FeatureExtensionServices { /** * FeatureExtension manager extension point ID. */ - String ID = "org.eclipse.sirius.featureExtensions"; + String ID = "org.eclipse.sirius.featureExtensions"; //$NON-NLS-1$ /** * Extension point attribute for the feature extension class. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Enable a new feature extension. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusResourceHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusResourceHelper.java index c4b80f8ea9..603cfd6e9e 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusResourceHelper.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusResourceHelper.java @@ -132,7 +132,7 @@ public final class SiriusResourceHelper { final TransactionalEditingDomain domain = session.getTransactionalEditingDomain(); for (final Iterator<Resource> iterator = domain.getResourceSet().getResources().iterator(); iterator.hasNext() && editingDomainViewpoint == null; /**/) { final Resource editingDomainResource = iterator.next(); - if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false")) + if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false")) //$NON-NLS-1$ //$NON-NLS-2$ && !SiriusUtil.DESCRIPTION_MODEL_EXTENSION.equals(editingDomainResource.getURI().fileExtension())) { continue; } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusUtil.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusUtil.java index d45c6fdd11..d1259e33be 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusUtil.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/SiriusUtil.java @@ -177,7 +177,7 @@ public final class SiriusUtil { public static boolean isFromSirius(final Object ep) { if (ep != null) { final String packageName = ep.getClass().getPackage().getName(); - return packageName.startsWith("org.eclipse.sirius"); + return packageName.startsWith("org.eclipse.sirius"); //$NON-NLS-1$ } return false; } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask.java index f0263068a1..bfe7387b6b 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask.java @@ -52,7 +52,7 @@ public class InitInterpreterFromParsedVariableTask extends AbstractCommandTask { */ public void execute() { if (message != null && message.length() == 0) { - setVariable(Integer.valueOf(0), ""); + setVariable(Integer.valueOf(0), ""); //$NON-NLS-1$ } else { final MessageFormat parser = new MessageFormat(messageMask); try { @@ -74,7 +74,7 @@ public class InitInterpreterFromParsedVariableTask extends AbstractCommandTask { */ private void setVariable(Integer i, Object value) { interpreter.setVariable(i.toString(), value); - interpreter.setVariable("arg" + i.toString(), value); + interpreter.setVariable("arg" + i.toString(), value); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask2.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask2.java index af03bdbbae..8f25b7d4e8 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask2.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/helper/task/label/InitInterpreterFromParsedVariableTask2.java @@ -25,7 +25,7 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; * @author lredor */ public class InitInterpreterFromParsedVariableTask2 extends AbstractCommandTask { - private static final String DEFAULT_MESSAGE_MASK = "{0}"; + private static final String DEFAULT_MESSAGE_MASK = "{0}"; //$NON-NLS-1$ private IInterpreter interpreter; @@ -56,7 +56,7 @@ public class InitInterpreterFromParsedVariableTask2 extends AbstractCommandTask */ public void execute() { if (message == null || (message instanceof String && ((String) message).length() == 0)) { - setVariable(Integer.valueOf(0), ""); + setVariable(Integer.valueOf(0), ""); //$NON-NLS-1$ } else if (DEFAULT_MESSAGE_MASK.equals(messageMask) && !(message instanceof String)) { setVariable(Integer.valueOf(0), message); } else { @@ -81,7 +81,7 @@ public class InitInterpreterFromParsedVariableTask2 extends AbstractCommandTask */ private void setVariable(Integer i, Object value) { interpreter.setVariable(i.toString(), value); - interpreter.setVariable("arg" + i.toString(), value); + interpreter.setVariable("arg" + i.toString(), value); //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/MarkerRuntimeLogger.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/MarkerRuntimeLogger.java index b049738e4d..4cdaf33f7f 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/MarkerRuntimeLogger.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/MarkerRuntimeLogger.java @@ -22,10 +22,10 @@ public interface MarkerRuntimeLogger { /** * Defines the type of the marker for Sirius. */ - String MARKER_TYPE = "org.eclipse.sirius.viewpointMarker"; + String MARKER_TYPE = "org.eclipse.sirius.viewpointMarker"; //$NON-NLS-1$ /** * Defines the URI of the marker attribute. */ - String URI_MARKER_ATTRIBUTE = "viewpointURIMarker"; + String URI_MARKER_ATTRIBUTE = "viewpointURIMarker"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/RuntimeLoggerManager.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/RuntimeLoggerManager.java index 5df150d042..e60ae15cb7 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/RuntimeLoggerManager.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/logger/RuntimeLoggerManager.java @@ -29,12 +29,12 @@ public interface RuntimeLoggerManager extends RuntimeLogger { /** * Extension point ID. */ - String ID = "org.eclipse.sirius.runtimeLogger"; + String ID = "org.eclipse.sirius.runtimeLogger"; //$NON-NLS-1$ /** * What need to be extended. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Decorate an existing interpreter to provide safe (without exceptions) diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/AbstractMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/AbstractMigrationParticipant.java index 02489f227f..e52c353690 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/AbstractMigrationParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/AbstractMigrationParticipant.java @@ -42,12 +42,12 @@ public abstract class AbstractMigrationParticipant implements IMigrationParticip * Version number return when the representations file has never been loaded * since the rewrite of migration framework. */ - public static final Version INITIAL_VERSION = Version.parseVersion("0.0.0"); + public static final Version INITIAL_VERSION = Version.parseVersion("0.0.0"); //$NON-NLS-1$ /** * Version 6.5.0 of Sirius. */ - public static final Version VERSION_VP_6_5_0 = Version.parseVersion("6.5.0"); + public static final Version VERSION_VP_6_5_0 = Version.parseVersion("6.5.0"); //$NON-NLS-1$ @Override public EStructuralFeature getAttribute(EClass eClass, String name, String loadedVersion) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/IMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/IMigrationParticipant.java index 7c7288d296..3644747b21 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/IMigrationParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/migration/IMigrationParticipant.java @@ -31,12 +31,12 @@ public interface IMigrationParticipant { /** * Identify participants to representations file (aird) migration. */ - String REPRESENTATIONSFILE_KIND = "RepresentationsFile"; + String REPRESENTATIONSFILE_KIND = "RepresentationsFile"; //$NON-NLS-1$ /** * Identify participants to VSM (odesign) migration. */ - String VSM_KIND = "VSM"; + String VSM_KIND = "VSM"; //$NON-NLS-1$ /** * Called during the parsing of XMIResources (at loading time). It allows to diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/AbstractRepresentationsFileJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/AbstractRepresentationsFileJob.java index 4e63494fd3..a25fc5feaf 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/AbstractRepresentationsFileJob.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/AbstractRepresentationsFileJob.java @@ -24,7 +24,7 @@ public abstract class AbstractRepresentationsFileJob extends WorkspaceJob { /** * The family id for this kind of job. */ - public static final String FAMILY = SiriusPlugin.ID + ".representationsFile"; + public static final String FAMILY = SiriusPlugin.ID + ".representationsFile"; //$NON-NLS-1$ /** * Default constructor. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/ModelingProject.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/ModelingProject.java index 59626d0bfb..9031329dc4 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/ModelingProject.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/modelingproject/ModelingProject.java @@ -37,10 +37,10 @@ import org.eclipse.sirius.viewpoint.SiriusPlugin; public class ModelingProject implements IProjectNature, IModelingElement { /** The nature id. */ - public static final String NATURE_ID = "org.eclipse.sirius.nature.modelingproject"; + public static final String NATURE_ID = "org.eclipse.sirius.nature.modelingproject"; //$NON-NLS-1$ /** The default name for the representations file of a modeling project. */ - public static final String DEFAULT_REPRESENTATIONS_FILE_NAME = "representations.aird"; + public static final String DEFAULT_REPRESENTATIONS_FILE_NAME = "representations.aird"; //$NON-NLS-1$ /** the project on which the nature is applied. */ private IProject project; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AirDResouceQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AirDResouceQuery.java index 5e16784caf..e131debdf8 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AirDResouceQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/AirDResouceQuery.java @@ -28,7 +28,7 @@ public class AirDResouceQuery { /** * the annotation source. */ - public static final String ANNOTATION_SOURCE = "Migration"; + public static final String ANNOTATION_SOURCE = "Migration"; //$NON-NLS-1$ private DAnalysis analysis; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/URIQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/URIQuery.java index 7d8b9946a1..999e74f6ce 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/URIQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/URIQuery.java @@ -26,16 +26,16 @@ import org.eclipse.sirius.ext.base.Options; public class URIQuery { /** The {@link URI} scheme used for Sirius environment xmi resources. */ - public static final String ENVIRONMENT_URI_SCHEME = "environment"; + public static final String ENVIRONMENT_URI_SCHEME = "environment"; //$NON-NLS-1$ /** The {@link URI} of Sirius core environment xmi resource. */ - public static final URI VIEWPOINT_ENVIRONMENT_QUERY = URI.createURI(ENVIRONMENT_URI_SCHEME + ":/viewpoint"); + public static final URI VIEWPOINT_ENVIRONMENT_QUERY = URI.createURI(ENVIRONMENT_URI_SCHEME + ":/viewpoint"); //$NON-NLS-1$ /** The {@link URI} scheme used for InMemory URIs. */ - public static final String INMEMORY_URI_SCHEME = "memory"; + public static final String INMEMORY_URI_SCHEME = "memory"; //$NON-NLS-1$ /** The {@link URI} scheme used for CDO URIs. */ - public static final String CDO_URI_SCHEME = "cdo"; + public static final String CDO_URI_SCHEME = "cdo"; //$NON-NLS-1$ private URI uri; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointQuery.java index ad700cba28..2e4f086854 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointQuery.java @@ -87,7 +87,7 @@ public class ViewpointQuery { if (vpResource != null && vpResource.getURI().isPlatform()) { URI resourceURI = vpResource.getURI(); String pluginId = resourceURI.segment(1); - String uri = ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + vp.getName(); + String uri = ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + vp.getName(); //$NON-NLS-1$ //$NON-NLS-2$ return Options.newSome(URI.createURI(uri)); } return Options.newNone(); @@ -131,7 +131,7 @@ public class ViewpointQuery { supportedExtensions = vp.getModelFileExtension().trim(); } - for (String supported : supportedExtensions.split(" +")) { + for (String supported : supportedExtensions.split(" +")) { //$NON-NLS-1$ if (matches(ext, supported.trim())) { return true; } @@ -143,7 +143,7 @@ public class ViewpointQuery { if (StringUtil.JOKER_STRING.equals(supportedExtension)) { return true; } - String semanticExtensionPattern = StringUtil.JOKER_STRING + "." + ext; + String semanticExtensionPattern = StringUtil.JOKER_STRING + "." + ext; //$NON-NLS-1$ return ext.equals(supportedExtension) || semanticExtensionPattern.equals(supportedExtension); } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointURIQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointURIQuery.java index 80f988b040..1700965247 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointURIQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/query/ViewpointURIQuery.java @@ -33,7 +33,7 @@ public class ViewpointURIQuery { /** * THe URI scheme used for Sirius URIs. */ - public static final String VIEWPOINT_URI_SCHEME = "viewpoint"; + public static final String VIEWPOINT_URI_SCHEME = "viewpoint"; //$NON-NLS-1$ /** * The URI to query. @@ -94,13 +94,13 @@ public class ViewpointURIQuery { String pluginId = uri.segment(1); if (target instanceof Viewpoint) { String viewpointName = ((Viewpoint) target).getName(); - URI logicalViewpointUri = URI.createURI(ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + viewpointName); + URI logicalViewpointUri = URI.createURI(ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + viewpointName); //$NON-NLS-1$ //$NON-NLS-2$ result = Options.newSome(logicalViewpointUri); } else { Option<EObject> viewpointContext = new EObjectQuery(target).getFirstAncestorOfType(DescriptionPackage.eINSTANCE.getViewpoint()); if (viewpointContext.some()) { String viewpointName = ((Viewpoint) viewpointContext.get()).getName(); - URI logicalViewpointUri = URI.createURI(ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + viewpointName); + URI logicalViewpointUri = URI.createURI(ViewpointURIQuery.VIEWPOINT_URI_SCHEME + ":/" + pluginId + "/" + viewpointName); //$NON-NLS-1$ //$NON-NLS-2$ result = Options.newSome(logicalViewpointUri.appendFragment(uri.fragment())); } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java index 7076b542d4..7de0e603d6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/repair/SiriusRepairProcess.java @@ -85,7 +85,7 @@ public class SiriusRepairProcess { /** * Quote for messages. */ - private static final String QUOTE = "\""; + private static final String QUOTE = "\""; //$NON-NLS-1$ private List<IRepairParticipant> repairParticipants; @@ -109,11 +109,11 @@ public class SiriusRepairProcess { private List<IRepairParticipant> getRepairParticipants() { List<IRepairParticipant> participants = new ArrayList<IRepairParticipant>(); - IConfigurationElement[] config = EclipseUtil.getConfigurationElementsFor("org.eclipse.sirius.repairParticipant"); + IConfigurationElement[] config = EclipseUtil.getConfigurationElementsFor("org.eclipse.sirius.repairParticipant"); //$NON-NLS-1$ for (IConfigurationElement configurationElement : config) { try { - Object contribution = configurationElement.createExecutableExtension("class"); + Object contribution = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$ if (contribution instanceof IRepairParticipant) { participants.add((IRepairParticipant) contribution); } @@ -162,7 +162,7 @@ public class SiriusRepairProcess { // List of couples <Original file, Backup file> Map<IFile, IFile> originalToBackupFiles = new HashMap<IFile, IFile>(); try { - monitor.beginTask("", 4); + monitor.beginTask("", 4); //$NON-NLS-1$ monitor.subTask("Loading model"); session = SessionFactory.INSTANCE.createSession(sessionResourceURI, new SubProgressMonitor(monitor, 1)); session.setReloadingPolicy(new ReloadingPolicy() { @@ -305,7 +305,7 @@ public class SiriusRepairProcess { MigrationCommandExecutor migrationCommandExecutor = new MigrationCommandExecutor(); List<DView> ownedViews = dAnalysis.getOwnedViews(); - monitor.beginTask("", 7 * ownedViews.size()); + monitor.beginTask("", 7 * ownedViews.size()); //$NON-NLS-1$ for (final DView view : ownedViews) { for (IRepairParticipant participant : repairParticipants) { participant.startRepairOnView(session, view); @@ -385,7 +385,7 @@ public class SiriusRepairProcess { revertBackupFile(originalToBackupFile.getKey(), originalToBackupFile.getValue(), migrationMonitor); } } catch (IOException e) { - SiriusPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, SiriusPlugin.ID, "", e)); + SiriusPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, SiriusPlugin.ID, "", e)); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/CustomDataConstants.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/CustomDataConstants.java index 76605a1813..d893d42845 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/CustomDataConstants.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/CustomDataConstants.java @@ -19,21 +19,21 @@ public interface CustomDataConstants { /** * custom data key for representations. */ - String DREPRESENTATION = "DREPRESENTATION"; + String DREPRESENTATION = "DREPRESENTATION"; //$NON-NLS-1$ /** * custom data key for GMF diagrams instances. */ - String GMF_DIAGRAMS = "GMF_DIAGRAMS"; + String GMF_DIAGRAMS = "GMF_DIAGRAMS"; //$NON-NLS-1$ /** * custom data key for feature extensions.. */ - String DFEATUREEXTENSION = "DFEATUREEXTENSION"; + String DFEATUREEXTENSION = "DFEATUREEXTENSION"; //$NON-NLS-1$ /** * custom data key for representations from description. This key should be * used only to get data, it's a virtual key. */ - String DREPRESENTATION_FROM_DESCRIPTION = "DREPRESENTATION_FROM_DESCRIPTION"; + String DREPRESENTATION_FROM_DESCRIPTION = "DREPRESENTATION_FROM_DESCRIPTION"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/Session.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/Session.java index ae02fb34e0..4ddc3b97fd 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/Session.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/Session.java @@ -36,7 +36,7 @@ public interface Session { /** * ID for dangling, broken or invalid sessions. */ - String INVALID_SESSION = "INVALID SESSION"; + String INVALID_SESSION = "INVALID SESSION"; //$NON-NLS-1$ /** * Open the session and add it to the {@link SessionManager}. Initialize a diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/SessionManagerListener.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/SessionManagerListener.java index b6b2a4adc9..6889c6d1e5 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/SessionManagerListener.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/SessionManagerListener.java @@ -20,10 +20,10 @@ import org.eclipse.sirius.viewpoint.description.Viewpoint; public interface SessionManagerListener { /** The extension point ID. */ - String ID = "org.eclipse.sirius.sessionManagerListener"; + String ID = "org.eclipse.sirius.sessionManagerListener"; //$NON-NLS-1$ /** The class attribute. */ - String CLASS_ATTRIBUTE = "class"; + String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$ /** * Called when a new session has been added in the manager. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java index a864d5ccac..030b5d899c 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java @@ -30,14 +30,14 @@ public final class DAnalysisSelectorService { /** * analysis selector extension point ID. */ - public static final String ID = "org.eclipse.sirius.analysisSelectorProvider"; + public static final String ID = "org.eclipse.sirius.analysisSelectorProvider"; //$NON-NLS-1$ /** * Extension point attribute for the analysis selector provider class. */ - public static final String CLASS_ATTRIBUTE = "providerClass"; + public static final String CLASS_ATTRIBUTE = "providerClass"; //$NON-NLS-1$ - private static final String DEFAULT_PROVIDER_ID = "org.eclipse.sirius.analysisSelectorProvider.default"; + private static final String DEFAULT_PROVIDER_ID = "org.eclipse.sirius.analysisSelectorProvider.default"; //$NON-NLS-1$ private static DAnalysisSelectorProvider defaultSiriusProvider; @@ -97,7 +97,7 @@ public final class DAnalysisSelectorService { * Initialize the customer providers and the Sirius default provider. */ private static void initializeProviders() { - Map<String, Collection<DAnalysisSelectorProvider>> providers = EclipseUtil.getExtensionPluginsByKey(DAnalysisSelectorProvider.class, ID, CLASS_ATTRIBUTE, "id"); + Map<String, Collection<DAnalysisSelectorProvider>> providers = EclipseUtil.getExtensionPluginsByKey(DAnalysisSelectorProvider.class, ID, CLASS_ATTRIBUTE, "id"); //$NON-NLS-1$ Collection<DAnalysisSelectorProvider> defaults = providers.get(DAnalysisSelectorService.DEFAULT_PROVIDER_ID); if (defaults == null || defaults.isEmpty()) { SiriusPlugin.getDefault().warning(String.format("No default analysis selector provider found at extension point \"%s\", using the DefaultAnalysisSelectorProvider instead.", ID), null); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/color/DefaultColorStyleDescription.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/color/DefaultColorStyleDescription.java index 0ed198e122..a277c67220 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/color/DefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/color/DefaultColorStyleDescription.java @@ -24,7 +24,7 @@ import org.eclipse.sirius.viewpoint.description.style.util.StyleSwitch; */ public class DefaultColorStyleDescription extends StyleSwitch<EObject> { - private static final String BLACK = "black"; + private static final String BLACK = "black"; //$NON-NLS-1$ /** * Set the default color descriptions on the given EObject. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/FeatureContributor.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/FeatureContributor.java index 704f603d73..9eeedbd58f 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/FeatureContributor.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/FeatureContributor.java @@ -208,7 +208,7 @@ public class FeatureContributor { } private String featureString(EStructuralFeature feature) { - return feature.getContainerClass().getName() + "." + feature.getName(); + return feature.getContainerClass().getName() + "." + feature.getName(); //$NON-NLS-1$ } private void checkFeatureIsPresent(EObject obj, EStructuralFeature feature, String name) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/IntrinsicPathIdentifier.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/IntrinsicPathIdentifier.java index 33ca49f185..d14e4f8f66 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/IntrinsicPathIdentifier.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/IntrinsicPathIdentifier.java @@ -42,7 +42,7 @@ public class IntrinsicPathIdentifier implements Function<EObject, String> { internalEObject = container; } - StringBuilder result = new StringBuilder("#//"); + StringBuilder result = new StringBuilder("#//"); //$NON-NLS-1$ for (int i = uriFragmentPath.size() - 1; i >= 0; --i) { result.append('/'); result.append(uriFragmentPath.get(i)); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ModelContributor.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ModelContributor.java index 5d5705499a..2203a6cde8 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ModelContributor.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/ModelContributor.java @@ -126,8 +126,8 @@ public class ModelContributor { List<ResolvedContribution> result = Lists.newArrayList(); for (Contribution contribution : contributions) { HashMap<String, Object> context = Maps.newHashMap(); - context.put("self", contribution); - context.put("sources", roots); + context.put("self", contribution); //$NON-NLS-1$ + context.put("sources", roots); //$NON-NLS-1$ Option<EObject> source = resolver.resolve(contribution.getSource(), context); Option<EObject> target = resolver.resolve(contribution.getTarget(), context); if (source.some() && target.some()) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/SiriusReferenceResolver.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/SiriusReferenceResolver.java index ca3a8f1345..e8e3d0f5e8 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/SiriusReferenceResolver.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/contribution/SiriusReferenceResolver.java @@ -31,7 +31,7 @@ import com.google.common.base.Preconditions; * @author pierre-charles.david@obeo.fr */ public class SiriusReferenceResolver implements ReferenceResolver { - private static final String SOURCES_VARIABLE_NAME = "sources"; + private static final String SOURCES_VARIABLE_NAME = "sources"; //$NON-NLS-1$ /** * The interpreter to use for computed expressions. @@ -77,10 +77,10 @@ public class SiriusReferenceResolver implements ReferenceResolver { private EObject resolveComputedReference(ComputedEObjectReference computedRef, Map<String, Object> context) { EObject result = null; String expr = computedRef.getValueExpression(); - if (expr != null && interpreter.provides(expr) && context.get("self") instanceof EObject) { + if (expr != null && interpreter.provides(expr) && context.get("self") instanceof EObject) { //$NON-NLS-1$ try { interpreter.setVariable(SOURCES_VARIABLE_NAME, context.get(SOURCES_VARIABLE_NAME)); - result = interpreter.evaluateEObject((EObject) context.get("self"), expr); + result = interpreter.evaluateEObject((EObject) context.get("self"), expr); //$NON-NLS-1$ } catch (EvaluationException e) { // TODO Log warning } finally { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java index 3abfe80264..bed7122e77 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/dialect/description/ValidationInterpretedExpressionTargetSwitch.java @@ -157,7 +157,7 @@ public class ValidationInterpretedExpressionTargetSwitch extends ValidationSwitc case ValidationPackage.VIEW_VALIDATION_RULE__MESSAGE: case DO_NOT_CONSIDER_FEATURE: // Evaluation on DDiagramElement -> see history if it changes. - Collection<String> targetTypes = Lists.newArrayList("diagram.DDiagramElement"); + Collection<String> targetTypes = Lists.newArrayList("diagram.DDiagramElement"); //$NON-NLS-1$ result = Options.newSome(targetTypes); break; default: diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/ChangeContextTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/ChangeContextTask.java index e5504fe974..92b1a10521 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/ChangeContextTask.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/ChangeContextTask.java @@ -30,12 +30,12 @@ public class ChangeContextTask extends AbstractOperationTask { /** The operation that describes how to change the context. */ private ChangeContext op; - /** the interpreter to evaluate expression with a */ + /** The interpreter to evaluate expression with. */ private RuntimeLoggerInterpreter safeInterpreter; /** * Create a new {@link ChangeContextTask}. - * + * * @param context * the stack of contexts. * @param extPackage @@ -52,11 +52,7 @@ public class ChangeContextTask extends AbstractOperationTask { this.safeInterpreter = RuntimeLoggerManager.INSTANCE.decorate(interpreter); } - /** - * {@inheritDoc} - * - * @see org.eclipse.sirius.business.api.helper.task.ICommandTask#execute() - */ + @Override public void execute() { final EObject browseResult = safeInterpreter.evaluateEObject(context.getCurrentTarget(), op, ToolPackage.eINSTANCE.getChangeContext_BrowseExpression()); if (browseResult != null) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/SwitchTask.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/SwitchTask.java index 67edfe89df..3d2d14ccf0 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/SwitchTask.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/helper/task/operations/SwitchTask.java @@ -110,7 +110,7 @@ public class SwitchTask extends AbstractOperationTask { * @see org.eclipse.sirius.business.api.helper.task.ICommandTask#getLabel() */ public String getLabel() { - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/logger/MarkerRuntimeLoggerImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/logger/MarkerRuntimeLoggerImpl.java index 37df99599c..0d51a9579b 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/logger/MarkerRuntimeLoggerImpl.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/logger/MarkerRuntimeLoggerImpl.java @@ -126,7 +126,7 @@ public class MarkerRuntimeLoggerImpl implements RuntimeLogger, MarkerRuntimeLogg // CDO Repository if (relativePath != null && root != null) { try { - if (!"".equals(relativePath) && root.findMember(relativePath) != null) { + if (!"".equals(relativePath) && root.findMember(relativePath) != null) { //$NON-NLS-1$ final IMarker[] markers = root.findMember(relativePath).findMarkers(MarkerRuntimeLogger.MARKER_TYPE, false, IResource.DEPTH_ZERO); for (final IMarker marker : markers) { marker.delete(); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/MetamodelExtensionSettingSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/MetamodelExtensionSettingSpec.java index a97c8c8db7..b96f13c10f 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/MetamodelExtensionSettingSpec.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/MetamodelExtensionSettingSpec.java @@ -30,7 +30,7 @@ public class MetamodelExtensionSettingSpec extends MetamodelExtensionSettingImpl * @see org.eclipse.sirius.description.impl.SiriusOperationImpl#updateAnalysis(org.eclipse.sirius.viewpoint.DRepresentationContainer) */ public void updateAnalysis(final DRepresentationContainer analysis) { - if (getExtensionGroup() != null && SiriusPlugin.getDefault().getModelAccessorRegistry().getModelAccessor(analysis).eInstanceOf(getExtensionGroup(), "ExtensionGroup")) { + if (getExtensionGroup() != null && SiriusPlugin.getDefault().getModelAccessorRegistry().getModelAccessor(analysis).eInstanceOf(getExtensionGroup(), "ExtensionGroup")) { //$NON-NLS-1$ final EObject group = getExtensionGroup(); final MetaModelExtension extension = ViewpointFactory.eINSTANCE.createMetaModelExtension(); extension.setExtensionGroup(group); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/EClassHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/EClassHelper.java index d5989e5ba7..6721807b01 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/EClassHelper.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/EClassHelper.java @@ -39,12 +39,12 @@ public final class EClassHelper { private static String getParentPath(EObject eClass) { EObject container = eClass.eContainer(); - String name = ""; + String name = ""; //$NON-NLS-1$ if (eClass instanceof ENamedElement) { name = ((ENamedElement) eClass).getName(); } if (container != null) { - return getParentPath(container) + "." + name; + return getParentPath(container) + "." + name; //$NON-NLS-1$ } return name; } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractSiriusMigrationService.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractSiriusMigrationService.java index 9c73e0d357..b7e217ac04 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractSiriusMigrationService.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractSiriusMigrationService.java @@ -50,11 +50,11 @@ public abstract class AbstractSiriusMigrationService implements IMigrationPartic * The value can be null if the resource was created before the current * migration mechanism. */ - public static final String OPTION_RESOURCE_MIGRATION_LOADEDVERSION = "RESOURCE_MIGRATION_LOADEDVERSION"; + public static final String OPTION_RESOURCE_MIGRATION_LOADEDVERSION = "RESOURCE_MIGRATION_LOADEDVERSION"; //$NON-NLS-1$ // This migration way was introduced with 6.5.0.201208161001 version // for both VSM and representations files. - private static final Version FIRST_VERSION = new Version("6.5.0.201208161001"); + private static final Version FIRST_VERSION = new Version("6.5.0.201208161001"); //$NON-NLS-1$ /** * loaded delegates contributions. @@ -73,12 +73,12 @@ public abstract class AbstractSiriusMigrationService implements IMigrationPartic */ protected void loadContributions() { delegatesParticipants.clear(); - IConfigurationElement[] config = EclipseUtil.getConfigurationElementsFor("org.eclipse.sirius.migrationParticipant"); + IConfigurationElement[] config = EclipseUtil.getConfigurationElementsFor("org.eclipse.sirius.migrationParticipant"); //$NON-NLS-1$ for (IConfigurationElement configurationElement : config) { try { - String kind = configurationElement.getAttribute("kind"); + String kind = configurationElement.getAttribute("kind"); //$NON-NLS-1$ if (kind.equals(getKind())) { - Object contribution = configurationElement.createExecutableExtension("class"); + Object contribution = configurationElement.createExecutableExtension("class"); //$NON-NLS-1$ if (contribution instanceof IMigrationParticipant) { delegatesParticipants.add((IMigrationParticipant) contribution); } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractVersionSAXParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractVersionSAXParser.java index 4ceb323a5c..f422af06dd 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractVersionSAXParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/AbstractVersionSAXParser.java @@ -111,7 +111,7 @@ public abstract class AbstractVersionSAXParser { @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (qName.equals(getVersionedElementQualifiedName())) { - version = attributes.getValue("version"); + version = attributes.getValue("version"); //$NON-NLS-1$ throw new SiriusSaxParserNormalAbortException("All needed informations have been reached. Stop the parsing."); } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/FontFormatMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/FontFormatMigrationParticipant.java index 552d94003c..9f500f6a4e 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/FontFormatMigrationParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/FontFormatMigrationParticipant.java @@ -30,11 +30,11 @@ import com.google.common.collect.Lists; */ public class FontFormatMigrationParticipant extends AbstractMigrationParticipant { - private static final Version MIGRATION_VERSION = new Version("10.0.0.201505222000"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201505222000"); //$NON-NLS-1$ - private static final String ITALIC = "italic"; + private static final String ITALIC = "italic"; //$NON-NLS-1$ - private static final String BOLD = "bold"; + private static final String BOLD = "bold"; //$NON-NLS-1$ @Override public Version getMigrationVersion() { @@ -60,7 +60,7 @@ public class FontFormatMigrationParticipant extends AbstractMigrationParticipant if (oldFontFormat.contains(BOLD)) { FontFormatHelper.setFontFormat(labelFormat, FontFormat.BOLD_LITERAL); } - return labelFormat.toString().replaceAll(",", "").replace("[", "").replace("]", ""); + return labelFormat.toString().replaceAll(",", "").replace("[", "").replace("]", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } } return null; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/NsURIMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/NsURIMigrationParticipant.java index 4c40fa86b0..65026ed4f3 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/NsURIMigrationParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/NsURIMigrationParticipant.java @@ -27,54 +27,54 @@ import com.google.common.collect.ImmutableMap; */ public class NsURIMigrationParticipant extends AbstractMigrationParticipant { - private static final String SIRIUS_DESCRIPTION_CONCERN_1_1_0 = "http://www.eclipse.org/sirius/description/concern/1.1.0"; + private static final String SIRIUS_DESCRIPTION_CONCERN_1_1_0 = "http://www.eclipse.org/sirius/description/concern/1.1.0"; //$NON-NLS-1$ - private static final String SIRIUS_DIAGRAM_DESCRIPTION_CONCERN_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/concern/1.1.0"; + private static final String SIRIUS_DIAGRAM_DESCRIPTION_CONCERN_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/concern/1.1.0"; //$NON-NLS-1$ - private static final String SIRIUS_DESCRIPTION_FILTER_1_1_0 = "http://www.eclipse.org/sirius/description/filter/1.1.0"; + private static final String SIRIUS_DESCRIPTION_FILTER_1_1_0 = "http://www.eclipse.org/sirius/description/filter/1.1.0"; //$NON-NLS-1$ - private static final String SIRIUS_DIAGRAM_DESCRIPTION_FILTER_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/filter/1.1.0"; + private static final String SIRIUS_DIAGRAM_DESCRIPTION_FILTER_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/filter/1.1.0"; //$NON-NLS-1$ - private static final String SIRIUS_DESCRIPTION_VALIDATION_1_1_0 = "http://www.eclipse.org/sirius/description/validation/1.1.0"; + private static final String SIRIUS_DESCRIPTION_VALIDATION_1_1_0 = "http://www.eclipse.org/sirius/description/validation/1.1.0"; //$NON-NLS-1$ - private static final String SIRIUS_DIAGRAM_DESCRIPTION_VALIDATION_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/validation/1.1.0"; + private static final String SIRIUS_DIAGRAM_DESCRIPTION_VALIDATION_1_1_0 = "http://www.eclipse.org/sirius/diagram/description/validation/1.1.0"; //$NON-NLS-1$ /** * The version 7.0.0 corresponds to the file format of Sirius 0.9 (more * recent than the 6.9.0 file format released under the name "Viewpoint"). */ - private static final Version SIRIUS_0_9_VERSION = new Version("7.0.0"); + private static final Version SIRIUS_0_9_VERSION = new Version("7.0.0"); //$NON-NLS-1$ /** * The version 8.0.0 corresponds to the file format of Sirius 1.0.0 M5. */ - private static final Version SIRIUS_1_0_0_M5_VERSION = new Version("8.0.0"); + private static final Version SIRIUS_1_0_0_M5_VERSION = new Version("8.0.0"); //$NON-NLS-1$ /** * The version 8.1.0 corresponds to the file format of Sirius 1.0.0 M6. */ - private static final Version SIRIUS_1_0_0_M6_VERSION = new Version("8.1.0"); + private static final Version SIRIUS_1_0_0_M6_VERSION = new Version("8.1.0"); //$NON-NLS-1$ private static final Map<String, String> FROM_VIEWPOINT_NS_URI_MAPPINGS = ImmutableMap.<String, String> builder() - .put("http://www.obeo.fr/dsl/viewpoint/description/contribution/1.0.0", "http://www.eclipse.org/sirius/description/contribution/1.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/1.1.0", "http://www.eclipse.org/sirius/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/description/1.1.0", "http://www.eclipse.org/sirius/description/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/description/style/1.1.0", "http://www.eclipse.org/sirius/description/style/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/description/tool/1.1.0", "http://www.eclipse.org/sirius/description/tool/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/description/audit/1.1.0", "http://www.eclipse.org/sirius/description/audit/1.1.0") - .put("http://www.obeo.fr/dsl/layoutdata/1.1.0", "http://www.eclipse.org/sirius/dsl/layoutdata/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/2.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/description/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/description/tool/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/ordering/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/ordering/2.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/template/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/template/2.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/table/1.1.0", "http://www.eclipse.org/sirius/table/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/table/description/1.1.0", "http://www.eclipse.org/sirius/table/description/1.1.0") - .put("http://www.obeo.fr/dsl/viewpoint/tree/1.0.0", "http://www.eclipse.org/sirius/tree/1.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/tree/description/1.0.0", "http://www.eclipse.org/sirius/tree/description/1.0.0") - .put("http://www.obeo.fr/dsl/viewpoint/description/concern/1.1.0", SIRIUS_DIAGRAM_DESCRIPTION_CONCERN_1_1_0) - .put("http://www.obeo.fr/dsl/viewpoint/description/filter/1.1.0", SIRIUS_DIAGRAM_DESCRIPTION_FILTER_1_1_0) - .put("http://www.obeo.fr/dsl/viewpoint/description/validation/1.1.0", SIRIUS_DESCRIPTION_VALIDATION_1_1_0).build(); + .put("http://www.obeo.fr/dsl/viewpoint/description/contribution/1.0.0", "http://www.eclipse.org/sirius/description/contribution/1.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/1.1.0", "http://www.eclipse.org/sirius/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/description/1.1.0", "http://www.eclipse.org/sirius/description/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/description/style/1.1.0", "http://www.eclipse.org/sirius/description/style/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/description/tool/1.1.0", "http://www.eclipse.org/sirius/description/tool/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/description/audit/1.1.0", "http://www.eclipse.org/sirius/description/audit/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/layoutdata/1.1.0", "http://www.eclipse.org/sirius/dsl/layoutdata/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/2.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/description/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/description/tool/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/ordering/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/ordering/2.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/diagram/sequence/template/2.0.0", "http://www.eclipse.org/sirius/diagram/sequence/template/2.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/table/1.1.0", "http://www.eclipse.org/sirius/table/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/table/description/1.1.0", "http://www.eclipse.org/sirius/table/description/1.1.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/tree/1.0.0", "http://www.eclipse.org/sirius/tree/1.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/tree/description/1.0.0", "http://www.eclipse.org/sirius/tree/description/1.0.0") //$NON-NLS-1$ //$NON-NLS-2$ + .put("http://www.obeo.fr/dsl/viewpoint/description/concern/1.1.0", SIRIUS_DIAGRAM_DESCRIPTION_CONCERN_1_1_0) //$NON-NLS-1$ + .put("http://www.obeo.fr/dsl/viewpoint/description/filter/1.1.0", SIRIUS_DIAGRAM_DESCRIPTION_FILTER_1_1_0) //$NON-NLS-1$ + .put("http://www.obeo.fr/dsl/viewpoint/description/validation/1.1.0", SIRIUS_DESCRIPTION_VALIDATION_1_1_0).build(); //$NON-NLS-1$ private static final Map<String, String> FROM_SIRIUS_0_9_NS_URI_MAPPINGS = ImmutableMap.<String, String> builder().put(SIRIUS_DESCRIPTION_CONCERN_1_1_0, SIRIUS_DIAGRAM_DESCRIPTION_CONCERN_1_1_0) .put(SIRIUS_DESCRIPTION_FILTER_1_1_0, SIRIUS_DIAGRAM_DESCRIPTION_FILTER_1_1_0).build(); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RGBValuesToDataTypeMigrationParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RGBValuesToDataTypeMigrationParticipant.java index ce5e043ead..bd3fd40852 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RGBValuesToDataTypeMigrationParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RGBValuesToDataTypeMigrationParticipant.java @@ -31,7 +31,7 @@ public class RGBValuesToDataTypeMigrationParticipant extends AbstractRepresentat /** * The VP version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("10.0.0.201502132000"); + public static final Version MIGRATION_VERSION = new Version("10.0.0.201502132000"); //$NON-NLS-1$ /** * @@ -64,9 +64,9 @@ public class RGBValuesToDataTypeMigrationParticipant extends AbstractRepresentat int green = 0; int blue = 0; - int redIndex = xmlAttributes.getIndex("red"); - int greenIndex = xmlAttributes.getIndex("green"); - int blueIndex = xmlAttributes.getIndex("blue"); + int redIndex = xmlAttributes.getIndex("red"); //$NON-NLS-1$ + int greenIndex = xmlAttributes.getIndex("green"); //$NON-NLS-1$ + int blueIndex = xmlAttributes.getIndex("blue"); //$NON-NLS-1$ if (redIndex != -1) { red = Integer.valueOf(xmlAttributes.getValue(redIndex)); } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RemoveOldMigrationAnnotations.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RemoveOldMigrationAnnotations.java index b2fc8f78d7..0e7529ee9a 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RemoveOldMigrationAnnotations.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RemoveOldMigrationAnnotations.java @@ -27,7 +27,7 @@ public class RemoveOldMigrationAnnotations extends AbstractRepresentationsFileMi /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("6.5.0.201210011230"); + private static final Version MIGRATION_VERSION = new Version("6.5.0.201210011230"); //$NON-NLS-1$ /** * {@inheritDoc} @@ -43,7 +43,7 @@ public class RemoveOldMigrationAnnotations extends AbstractRepresentationsFileMi Iterator<DAnnotationEntry> iterator = dAnalysis.getEAnnotations().iterator(); while (iterator.hasNext()) { DAnnotationEntry entry = iterator.next(); - if (entry.getSource().equals("Migration")) { + if (entry.getSource().equals("Migration")) { //$NON-NLS-1$ iterator.remove(); } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/ReplaceModelsBySemanticResources.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/ReplaceModelsBySemanticResources.java index 85e456b3df..344c034aad 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/ReplaceModelsBySemanticResources.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/ReplaceModelsBySemanticResources.java @@ -30,7 +30,7 @@ public class ReplaceModelsBySemanticResources extends AbstractRepresentationsFil /** * The VP version for which this migration is added. */ - public static final Version MIGRATION_VERSION = new Version("10.0.0.201505191300"); + public static final Version MIGRATION_VERSION = new Version("10.0.0.201505191300"); //$NON-NLS-1$ @Override public Version getMigrationVersion() { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileVersionSAXParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileVersionSAXParser.java index 6ceecdb0c0..93a1d0f8dc 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileVersionSAXParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/RepresentationsFileVersionSAXParser.java @@ -22,7 +22,7 @@ import org.eclipse.sirius.viewpoint.ViewpointPackage; public class RepresentationsFileVersionSAXParser extends AbstractVersionSAXParser { /* In Representations files, the DAnalysis element is versioned. */ - private static final String VERSIONED_ELEMENT_QUALIFIED_NAME = ViewpointPackage.eINSTANCE.getNsPrefix() + ":" + ViewpointPackage.eINSTANCE.getDAnalysis().getName(); + private static final String VERSIONED_ELEMENT_QUALIFIED_NAME = ViewpointPackage.eINSTANCE.getNsPrefix() + ":" + ViewpointPackage.eINSTANCE.getDAnalysis().getName(); //$NON-NLS-1$ /** * Constructor. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/Sirius3CleanUpParticipant.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/Sirius3CleanUpParticipant.java index 63b44adcbc..4568a92f7d 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/Sirius3CleanUpParticipant.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/Sirius3CleanUpParticipant.java @@ -39,7 +39,7 @@ public class Sirius3CleanUpParticipant extends AbstractRepresentationsFileMigrat /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("10.0.0.201504010000"); + private static final Version MIGRATION_VERSION = new Version("10.0.0.201504010000"); //$NON-NLS-1$ private Map<DView, EStructuralFeature> initializedFeature = new HashMap<DView, EStructuralFeature>(); @@ -68,7 +68,7 @@ public class Sirius3CleanUpParticipant extends AbstractRepresentationsFileMigrat @Override protected void handleFeature(EObject owner, EStructuralFeature unkownFeature, Object valueOfUnknownFeature) { - if (owner instanceof DView && unkownFeature.getName().equals("initialized")) { + if (owner instanceof DView && unkownFeature.getName().equals("initialized")) { //$NON-NLS-1$ Resource eResource = owner.eResource(); if (eResource != null) { AnyType anyType = ((XMLResource) eResource).getEObjectToExtensionMap().get(owner); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/RemoveOldMigrationAnnotations.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/RemoveOldMigrationAnnotations.java index 0e7f6a6940..ad49616924 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/RemoveOldMigrationAnnotations.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/RemoveOldMigrationAnnotations.java @@ -27,7 +27,7 @@ public class RemoveOldMigrationAnnotations extends AbstractVSMMigrationParticipa /** * The VP version for which this migration is added. */ - private static final Version MIGRATION_VERSION = new Version("6.5.0.201210011230"); + private static final Version MIGRATION_VERSION = new Version("6.5.0.201210011230"); //$NON-NLS-1$ /** * {@inheritDoc} @@ -43,7 +43,7 @@ public class RemoveOldMigrationAnnotations extends AbstractVSMMigrationParticipa Iterator<DAnnotation> iterator = group.getEAnnotations().iterator(); while (iterator.hasNext()) { DAnnotation entry = iterator.next(); - if (entry.getSource().equals("Migration")) { + if (entry.getSource().equals("Migration")) { //$NON-NLS-1$ iterator.remove(); } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMVersionSAXParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMVersionSAXParser.java index 7964a9eeb5..a8c25bfc80 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMVersionSAXParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/description/VSMVersionSAXParser.java @@ -23,7 +23,7 @@ import org.eclipse.sirius.viewpoint.description.DescriptionPackage; public class VSMVersionSAXParser extends AbstractVersionSAXParser { /* In VSM files, the Group element is versioned. */ - private static final String VERSIONED_ELEMENT_QUALIFIED_NAME = DescriptionPackage.eINSTANCE.getNsPrefix() + ":" + DescriptionPackage.eINSTANCE.getGroup().getName(); + private static final String VERSIONED_ELEMENT_QUALIFIED_NAME = DescriptionPackage.eINSTANCE.getNsPrefix() + ":" + DescriptionPackage.eINSTANCE.getGroup().getName(); //$NON-NLS-1$ /** * Constructor. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/MigrationUtil.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/MigrationUtil.java index d710bab17e..bfdc893f07 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/MigrationUtil.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/migration/resource/MigrationUtil.java @@ -47,11 +47,11 @@ import org.eclipse.sirius.viewpoint.SiriusPlugin; public final class MigrationUtil { /** The modeler description file extension for designer v3. */ - public static final String MODELER_DESCRIPTION_FILE_EXTENSION_V3 = "air"; + public static final String MODELER_DESCRIPTION_FILE_EXTENSION_V3 = "air"; //$NON-NLS-1$ - private static final String UTF_8 = "UTF-8"; + private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$ - private static final String DOT = "."; + private static final String DOT = "."; //$NON-NLS-1$ private MigrationUtil() { } @@ -191,7 +191,7 @@ public final class MigrationUtil { } } monitor.worked(1); - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/AttachSemanticResourcesJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/AttachSemanticResourcesJob.java index 98ceaa7ce4..3bd625ae74 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/AttachSemanticResourcesJob.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/AttachSemanticResourcesJob.java @@ -82,11 +82,6 @@ public class AttachSemanticResourcesJob extends Job { return Status.OK_STATUS; } - /** - * {@inheritDoc} - * - * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object) - */ @Override public boolean belongsTo(Object family) { return AbstractRepresentationsFileJob.FAMILY.equals(family); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/InitializeModelingProjectJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/InitializeModelingProjectJob.java index 618846ee6a..09616c04b0 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/InitializeModelingProjectJob.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/manager/InitializeModelingProjectJob.java @@ -55,7 +55,7 @@ public class InitializeModelingProjectJob extends WorkspaceJob { /** * The family id for this kind of job. */ - private static final String JOB_FAMILY_ID = SiriusPlugin.ID + ".initializemodelingprojects"; + private static final String JOB_FAMILY_ID = SiriusPlugin.ID + ".initializemodelingprojects"; //$NON-NLS-1$ /** * The projects concerned by this job. If null, all projects of the @@ -129,7 +129,7 @@ public class InitializeModelingProjectJob extends WorkspaceJob { } else { projectsTable = ResourcesPlugin.getWorkspace().getRoot().getProjects(); } - monitor.beginTask("", projectsTable.length); + monitor.beginTask("", projectsTable.length); //$NON-NLS-1$ for (int i = 0; i < projectsTable.length; i++) { Option<ModelingProject> optionalModelingProject = ModelingProject.asModelingProject(projectsTable[i]); if (optionalModelingProject.some()) { @@ -143,7 +143,7 @@ public class InitializeModelingProjectJob extends WorkspaceJob { optionalModelingProject.get().getMainRepresentationsFileURI(new SubProgressMonitor(monitor, 1), forceInit, true); } catch (IllegalArgumentException e) { // Add the problem to the result status of this job - errorStatus.add(new Status(IStatus.ERROR, SiriusPlugin.ID, IStatus.OK, e.getMessage(), null)); //$NON-NLS-1$) + errorStatus.add(new Status(IStatus.ERROR, SiriusPlugin.ID, IStatus.OK, e.getMessage(), null)); } } else { monitor.worked(1); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/ModelingMarker.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/ModelingMarker.java index ccd00eed3c..e18bf143e6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/ModelingMarker.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/modelingproject/marker/ModelingMarker.java @@ -19,5 +19,5 @@ public interface ModelingMarker { /** * Defines the type of the marker for Modeling project. */ - String MARKER_TYPE = "org.eclipse.sirius.modelingMarker"; + String MARKER_TYPE = "org.eclipse.sirius.modelingMarker"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/Movida.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/Movida.java index 80bcd4bef8..3be0575070 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/Movida.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/Movida.java @@ -17,7 +17,7 @@ package org.eclipse.sirius.business.internal.movida; * @author pierre-charles.david@obeo.fr */ public final class Movida { - private static final boolean ENABLED = Boolean.valueOf(System.getProperty("movida")); + private static final boolean ENABLED = Boolean.valueOf(System.getProperty("movida")); //$NON-NLS-1$ private Movida() { // Prevents instantiation. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/VSMResolver.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/VSMResolver.java index b2a670acb5..4480737337 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/VSMResolver.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/VSMResolver.java @@ -76,7 +76,7 @@ public class VSMResolver { } }); if (!missing.isEmpty()) { - String msg = MessageFormat.format("Some of the required logical Sirius URIs could not be resolved to physical resources: {0}.", Joiner.on(", ").join(missing)); + String msg = MessageFormat.format("Some of the required logical Sirius URIs could not be resolved to physical resources: {0}.", Joiner.on(", ").join(missing)); //$NON-NLS-2$ throw new IllegalArgumentException(msg); } else { return ImmutableSet.copyOf(Iterables.filter(allPhysical, Predicates.notNull())); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/ViewpointSelection.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/ViewpointSelection.java index 11492b3238..562a2e5f62 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/ViewpointSelection.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/ViewpointSelection.java @@ -196,10 +196,10 @@ public class ViewpointSelection { // CHECKSTYLE:OFF StringBuilder sb = new StringBuilder(); if (conflicts != null && !conflicts.isEmpty()) { - sb.append("Conflicts with: " + Joiner.on(", ").join(Iterables.transform(conflicts, shortName))).append("\n"); + sb.append("Conflicts with: " + Joiner.on(", ").join(Iterables.transform(conflicts, shortName))).append("\n"); //$NON-NLS-2$ //$NON-NLS-3$ } if (unavailable != null && !unavailable.isEmpty()) { - sb.append("Missing: " + Joiner.on(", ").join(Iterables.transform(unavailable, shortName))).append("\n"); + sb.append("Missing: " + Joiner.on(", ").join(Iterables.transform(unavailable, shortName))).append("\n"); //$NON-NLS-2$ //$NON-NLS-3$ } // CHECKSTYLE:ON return sb.toString(); @@ -233,6 +233,6 @@ public class ViewpointSelection { public String toString() { List<URI> uris = Lists.newArrayList(logicalViewpoints); Collections.sort(uris, Ordering.usingToString()); - return "Viewpoint Selection: " + Joiner.on(", ").join(uris); + return "Viewpoint Selection: " + Joiner.on(", ").join(uris); //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/MaskingPolicy.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/MaskingPolicy.java index 6f983414f2..3fade4a948 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/MaskingPolicy.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/MaskingPolicy.java @@ -107,7 +107,7 @@ public class MaskingPolicy { @Override public String toString() { - return logicalURI.toString() + " (" + provider.getURI().toString() + ")"; + return logicalURI.toString() + " (" + provider.getURI().toString() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java index 018c0254d4..66d22e6c1c 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointRegistry.java @@ -99,15 +99,15 @@ public class ViewpointRegistry extends org.eclipse.sirius.business.api.component public String toString() { StringBuilder sb = new StringBuilder(); // CHECKSTYLE:OFF - sb.append("Removed:\n\t").append(Joiner.on("\n\t").join(removed)).append("\n"); - sb.append("Added:\n\t").append(Joiner.on("\n\t").join(added)).append("\n"); - sb.append("Changed:\n\t").append(Joiner.on("\n\t").join(changed)).append("\n"); + sb.append("Removed:\n\t").append(Joiner.on("\n\t").join(removed)).append("\n"); //$NON-NLS-2$ //$NON-NLS-3$ + sb.append("Added:\n\t").append(Joiner.on("\n\t").join(added)).append("\n"); //$NON-NLS-2$ //$NON-NLS-3$ + sb.append("Changed:\n\t").append(Joiner.on("\n\t").join(changed)).append("\n"); //$NON-NLS-2$ //$NON-NLS-3$ // CHECKSTYLE:ON return sb.toString(); } } - private static final String VIEWPOINT_RESOURCE_TYPE_EXTENSION_POINT = "org.eclipse.sirius.viewpointResourceType"; + private static final String VIEWPOINT_RESOURCE_TYPE_EXTENSION_POINT = "org.eclipse.sirius.viewpointResourceType"; //$NON-NLS-1$ /** * The monitors from which we find the VSMs. @@ -168,24 +168,24 @@ public class ViewpointRegistry extends org.eclipse.sirius.business.api.component monitors.setListener(this); legacyMonitor = new LegacyPluginMonitor(this); configureResourceHandler(); - monitors.addMonitor("Legacy Plugins", legacyMonitor); - monitors.addMonitor("Plugins", new PluginMonitor(Platform.getExtensionRegistry(), compositeResourceHandler)); - monitors.addMonitor("Workspace", new WorkspaceMonitor(ResourcesPlugin.getWorkspace(), compositeResourceHandler)); + monitors.addMonitor("Legacy Plugins", legacyMonitor); //$NON-NLS-1$ + monitors.addMonitor("Plugins", new PluginMonitor(Platform.getExtensionRegistry(), compositeResourceHandler)); //$NON-NLS-1$ + monitors.addMonitor("Workspace", new WorkspaceMonitor(ResourcesPlugin.getWorkspace(), compositeResourceHandler)); //$NON-NLS-1$ } private void configureResourceHandler() { compositeResourceHandler.addResourceType(new DefaultViewpointResourceHandler()); IConfigurationElement[] elements = EclipseUtil.getConfigurationElementsFor(VIEWPOINT_RESOURCE_TYPE_EXTENSION_POINT); for (IConfigurationElement element : elements) { - if ("handler".equals(element.getName())) { + if ("handler".equals(element.getName())) { //$NON-NLS-1$ Object handler; try { - handler = element.createExecutableExtension("class"); + handler = element.createExecutableExtension("class"); //$NON-NLS-1$ if (handler instanceof ViewpointResourceHandler) { compositeResourceHandler.addResourceType((ViewpointResourceHandler) handler); } } catch (CoreException e) { - reportWarning("Could not instantiate contributed Sirius Resource Type handler " + element.getAttribute("class")); + reportWarning("Could not instantiate contributed Sirius Resource Type handler " + element.getAttribute("class")); //$NON-NLS-2$ } } } @@ -516,41 +516,41 @@ public class ViewpointRegistry extends org.eclipse.sirius.business.api.component // CHECKSTYLE:OFF private void warning(String message, Throwable th) { if (th == null) { - System.out.println("WARN: " + message); + System.out.println("WARN: " + message); //$NON-NLS-1$ } else { - System.out.println("WARN: " + message + "(" + th.toString() + ")"); + System.out.println("WARN: " + message + "(" + th.toString() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } System.out.flush(); } public void dumpStatus(StringBuilder out) { - out.append("Entries:\n"); + out.append("Entries:\n"); //$NON-NLS-1$ for (URI uri : Ordering.usingToString().sortedCopy(entries.keySet())) { Entry entry = entries.get(uri); - out.append(" - ").append(uri).append(" => ").append(entry.getResource().getURI()).append("\n"); + out.append(" - ").append(uri).append(" => ").append(entry.getResource().getURI()).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - out.append("\n"); - out.append("ResourceSet:\n"); + out.append("\n"); //$NON-NLS-1$ + out.append("ResourceSet:\n"); //$NON-NLS-1$ for (Resource res : resourceSet.getResources()) { - out.append(" - ").append(res.getURI()).append(" [loaded=").append(String.valueOf(res.isLoaded())).append("]").append("\n"); - out.append("\tResolved dependencies:\n\t\t").append(Joiner.on("\n\t\t").join(new ResourceQuery(res).getResolvedDependencies())).append("\n"); - out.append("\tUnresolved dependencies:\n\t\t").append(Joiner.on("\n\t\t").join(new ResourceQuery(res).getUnresolvedDependencies())).append("\n"); + out.append(" - ").append(res.getURI()).append(" [loaded=").append(String.valueOf(res.isLoaded())).append("]").append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + out.append("\tResolved dependencies:\n\t\t").append(Joiner.on("\n\t\t").join(new ResourceQuery(res).getResolvedDependencies())).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + out.append("\tUnresolved dependencies:\n\t\t").append(Joiner.on("\n\t\t").join(new ResourceQuery(res).getUnresolvedDependencies())).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - out.append("\n"); - out.append("Transitive dependencies:\n"); + out.append("\n"); //$NON-NLS-1$ + out.append("Transitive dependencies:\n"); //$NON-NLS-1$ ViewpointDependenciesTracker tracker = new ViewpointDependenciesTracker(this); for (URI uri : Sets.newHashSet(entries.keySet())) { - if (uri.toString().startsWith("viewpoint:/t/")) { + if (uri.toString().startsWith("viewpoint:/t/")) { //$NON-NLS-1$ tracker.add(uri); } } for (URI uri : tracker.getTrackedElements()) { - out.append(uri).append("\n"); - out.append(" - direct: ").append(Joiner.on(", ").join(tracker.getDependencies(uri))).append("\n"); - out.append(" - reverse: ").append(Joiner.on(", ").join(tracker.getReverseDependencies(uri))).append("\n"); - out.append("\n"); + out.append(uri).append("\n"); //$NON-NLS-1$ + out.append(" - direct: ").append(Joiner.on(", ").join(tracker.getDependencies(uri))).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + out.append(" - reverse: ").append(Joiner.on(", ").join(tracker.getReverseDependencies(uri))).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + out.append("\n"); //$NON-NLS-1$ } tracker.dispose(); } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIHandler.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIHandler.java index 559026df68..e003e891d4 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIHandler.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/ViewpointURIHandler.java @@ -44,7 +44,7 @@ public class ViewpointURIHandler extends URIHandlerImpl.PlatformSchemeAware { */ @Override public URI deresolve(URI uri) { - if (!baseURI.isPlatform() && "viewpoint".equals(baseURI.scheme())) { + if (!baseURI.isPlatform() && "viewpoint".equals(baseURI.scheme())) { //$NON-NLS-1$ baseURI = resourceSet.getURIConverter().normalize(baseURI); } if (Movida.isEnabled()) { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/monitoring/PluginMonitor.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/monitoring/PluginMonitor.java index 0637369d84..0638430823 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/monitoring/PluginMonitor.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/movida/registry/monitoring/PluginMonitor.java @@ -42,7 +42,7 @@ public class PluginMonitor extends AbstractViewpointResourceMonitor { /** * The identifier for the extension point used to register VSMs. */ - public static final String VSM_REGISTRATION_EXTENSION_POINT = "org.eclipse.sirius.viewpointSpecificationModel"; + public static final String VSM_REGISTRATION_EXTENSION_POINT = "org.eclipse.sirius.viewpointSpecificationModel"; //$NON-NLS-1$ /** * The bundle listener which detects VSMs registered in bundles which @@ -166,13 +166,13 @@ public class PluginMonitor extends AbstractViewpointResourceMonitor { Set<URI> discovered = Sets.newLinkedHashSet(); for (IConfigurationElement element : elements) { String contributingPlugin = element.getContributor().getName(); - String localPath = element.getAttribute("path"); + String localPath = element.getAttribute("path"); //$NON-NLS-1$ if (localPath == null) { reportWarning("Missing 'path' attribute for VSM definition in " + contributingPlugin + "; ignoring this definition."); continue; } try { - URI uri = URI.createPlatformPluginURI("/" + contributingPlugin + "/" + localPath, true); + URI uri = URI.createPlatformPluginURI("/" + contributingPlugin + "/" + localPath, true); //$NON-NLS-1$ //$NON-NLS-2$ if (!pluginResourceExists(contributingPlugin, localPath)) { reportWarning("Not resource found at specified location " + uri + " in " + contributingPlugin); continue; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ModelingProjectQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ModelingProjectQuery.java index 60c99d98d4..795bcfa5f6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ModelingProjectQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ModelingProjectQuery.java @@ -85,7 +85,7 @@ public class ModelingProjectQuery { public URI computeMainRepresentationsFileURI(IProgressMonitor monitor) throws IllegalArgumentException { URI result = null; List<IFile> sessionFiles = getRepresentationFiles(); - monitor.beginTask("", sessionFiles.size() + 1); + monitor.beginTask("", sessionFiles.size() + 1); //$NON-NLS-1$ Map<URI, Set<URI>> references = new HashMap<URI, Set<URI>>(sessionFiles.size()); for (IFile sessionFile : sessionFiles) { final RepresentationsFileSaxParser sessionSaxParser = new RepresentationsFileSaxParser(sessionFile); @@ -140,7 +140,7 @@ public class ModelingProjectQuery { } result.append(uri.lastSegment()); if (iterator.hasNext()) { - result.append(", "); + result.append(", "); //$NON-NLS-1$ } } return result.toString(); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ResourceDeltaQuery.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ResourceDeltaQuery.java index 7436cf993c..7c85d05988 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ResourceDeltaQuery.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/query/ResourceDeltaQuery.java @@ -61,11 +61,11 @@ public class ResourceDeltaQuery { } private Option<IProjectDescription> getOldProjectDescription() { - return getProjectDescription(ReflectionHelper.getFieldValueWithoutException(resourceDelta, "oldInfo")); + return getProjectDescription(ReflectionHelper.getFieldValueWithoutException(resourceDelta, "oldInfo")); //$NON-NLS-1$ } private Option<IProjectDescription> getNewProjectDescription() { - return getProjectDescription(ReflectionHelper.getFieldValueWithoutException(resourceDelta, "newInfo")); + return getProjectDescription(ReflectionHelper.getFieldValueWithoutException(resourceDelta, "newInfo")); //$NON-NLS-1$ } @SuppressWarnings("restriction") diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/XMIModelFileSaxParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/XMIModelFileSaxParser.java index 034c1dde7c..418a47d5e7 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/XMIModelFileSaxParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/resource/parser/XMIModelFileSaxParser.java @@ -60,7 +60,7 @@ public class XMIModelFileSaxParser { * A progress monitor */ public void analyze(final IProgressMonitor monitor) { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ XMIModelFileHandler xmiModelFileHandler = new XMIModelFileHandler(); InputStream inputStream = null; try { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java index 54810475ae..cbb0055061 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java @@ -608,7 +608,7 @@ public class DAnalysisSessionImpl extends DAnalysisSessionEObjectImpl implements } private void notifyNewMetamodels(final Resource newResource) { - if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false"))) { + if (Boolean.valueOf(System.getProperty("org.eclipse.sirius.enableUnsafeOptimisations", "false"))) { //$NON-NLS-1$ //$NON-NLS-2$ return; } final Collection<EPackage> collectedMetamodels = collectMetamodels(newResource.getAllContents()); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionServicesImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionServicesImpl.java index 69cf005bea..18048ec824 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionServicesImpl.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionServicesImpl.java @@ -304,8 +304,8 @@ public class DAnalysisSessionServicesImpl implements SessionService, DAnalysisSe } private boolean isAGMFDiagramOnAssociatedInstance(final EObject object, final EObject associatedInstance) { - if ("Diagram".equals(object.eClass().getName()) && object.eClass().getEPackage() != null && "notation".equals(object.eClass().getEPackage().getNsPrefix())) { - final EObject element = (EObject) object.eGet(object.eClass().getEStructuralFeature("element")); + if ("Diagram".equals(object.eClass().getName()) && object.eClass().getEPackage() != null && "notation".equals(object.eClass().getEPackage().getNsPrefix())) { //$NON-NLS-1$ //$NON-NLS-2$ + final EObject element = (EObject) object.eGet(object.eClass().getEStructuralFeature("element")); //$NON-NLS-1$ if (element != null && element == associatedInstance) { return true; } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DanglingRefRemovalTrigger.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DanglingRefRemovalTrigger.java index 1ff0ae693d..f61794d700 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DanglingRefRemovalTrigger.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DanglingRefRemovalTrigger.java @@ -162,13 +162,13 @@ public class DanglingRefRemovalTrigger implements ModelChangeTrigger { /** * Name of the GMF View feature to ignore in the remove dangling references. */ - private static final String NOTATION_VIEW_ELEMENT_REFERENCE_TO_IGNORE = "element"; + private static final String NOTATION_VIEW_ELEMENT_REFERENCE_TO_IGNORE = "element"; //$NON-NLS-1$ /** * Container name of the GMF View feature to ignore in the remove dangling * references. */ - private static final String NOTATION_VIEW_ELEMENT_REFERENCE_CONTAINER_TO_IGNORE = "org.eclipse.gmf.runtime.notation.View"; + private static final String NOTATION_VIEW_ELEMENT_REFERENCE_CONTAINER_TO_IGNORE = "org.eclipse.gmf.runtime.notation.View"; //$NON-NLS-1$ private Session session; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/ResourceSaveDiagnose.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/ResourceSaveDiagnose.java index fb8c6909bd..83d6c939d2 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/ResourceSaveDiagnose.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/ResourceSaveDiagnose.java @@ -70,7 +70,7 @@ public class ResourceSaveDiagnose { // CHECKSTYLE:OFF : code coming from // ResourceImpl.saveOnlyIfChangedWithFileBuffer resourcetoSave.eSetDeliver(false); - final File temporaryFile = File.createTempFile("ResourceSaveHelper", null); + final File temporaryFile = File.createTempFile("ResourceSaveHelper", null); //$NON-NLS-1$ boolean equal = true; try { final URI temporaryFileURI = URI.createFileURI(temporaryFile.getPath()); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java index fae8362961..a9b5f9b243 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java @@ -28,7 +28,7 @@ public class SaveSessionJob extends Job { /** * The family id for this kind of job. */ - public static final String FAMILY = SiriusPlugin.ID + ".saveSessionJob"; + public static final String FAMILY = SiriusPlugin.ID + ".saveSessionJob"; //$NON-NLS-1$ private static final String ACTION_NAME = "Session saving"; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileHandler.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileHandler.java index cbb20a0d5c..b5c2546ce6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileHandler.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileHandler.java @@ -62,13 +62,13 @@ public class RepresentationsFileHandler extends DefaultHandler { public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (qName.equals(ViewpointPackage.eINSTANCE.getDAnalysis_Models().getName())) { dAnalysisModels = true; - String hrefValue = attributes.getValue("href"); + String hrefValue = attributes.getValue("href"); //$NON-NLS-1$ if (hrefValue != null) { usedModels.add(URI.createURI(hrefValue).resolve(sessionURI).trimFragment()); } } else if (qName.equals(ViewpointPackage.eINSTANCE.getDAnalysis_ReferencedAnalysis().getName())) { dAnalysisReferencedAnalysis = true; - String hrefValue = attributes.getValue("href"); + String hrefValue = attributes.getValue("href"); //$NON-NLS-1$ if (hrefValue != null) { referencedAnalysis.add(URI.createURI(hrefValue).resolve(sessionURI).trimFragment()); } diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileSaxParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileSaxParser.java index 60516107f7..7295c4ff0d 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileSaxParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/parser/RepresentationsFileSaxParser.java @@ -63,7 +63,7 @@ public class RepresentationsFileSaxParser { * A progress monitor */ public void analyze(final IProgressMonitor monitor) { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ RepresentationsFileHandler sessionHandler = new RepresentationsFileHandler(getRepresentationsFileURI()); InputStream inputStream = null; try { diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/ui/NoUICallback.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/ui/NoUICallback.java index 80999bd51a..e4818effde 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/ui/NoUICallback.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/ui/NoUICallback.java @@ -141,7 +141,7 @@ public class NoUICallback implements UICallBack { * @see org.eclipse.sirius.tools.api.command.ui.UICallBack#getSessionDisplayed(org.eclipse.sirius.business.api.session.Session) */ public String getSessionNameToDisplayWhileSaving(Session session) { - return ""; + return ""; //$NON-NLS-1$ } /** diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/JavaActionFromToolCommand.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/JavaActionFromToolCommand.java index b58be98041..63a99ebfc4 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/JavaActionFromToolCommand.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/command/view/JavaActionFromToolCommand.java @@ -54,7 +54,7 @@ public final class JavaActionFromToolCommand extends RecordingCommand { * the container views */ public JavaActionFromToolCommand(TransactionalEditingDomain domain, IExternalJavaAction javaAction, ExternalJavaAction tool, Collection<DSemanticDecorator> containerViews) { - super(domain, "Java action from tool: " + (javaAction != null ? javaAction.getClass().getSimpleName() : "")); + super(domain, "Java action from tool: " + (javaAction != null ? javaAction.getClass().getSimpleName() : "")); //$NON-NLS-2$ this.action = javaAction; this.tool = tool; this.containerViews = containerViews; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/preferences/DCorePreferences.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/preferences/DCorePreferences.java index adb55b013c..57327aeb23 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/preferences/DCorePreferences.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/preferences/DCorePreferences.java @@ -20,13 +20,13 @@ package org.eclipse.sirius.tools.api.preferences; public interface DCorePreferences { /** Key for color registry max size preference. */ - String COLOR_REGISTRY_MAX_SIZE = "ColorRegistryMaxSize"; + String COLOR_REGISTRY_MAX_SIZE = "ColorRegistryMaxSize"; //$NON-NLS-1$ /** Default value for color registry max size preference. */ int COLOR_REGISTRY_MAX_SIZE_DEFAULT_VALUE = 2048; /** Key for font registry max size preference. */ - String FONT_REGISTRY_MAX_SIZE = "FontRegistryMaxSize"; + String FONT_REGISTRY_MAX_SIZE = "FontRegistryMaxSize"; //$NON-NLS-1$ /** Default value for font registry max size preference. */ int FONT_REGISTRY_MAX_SIZE_DEFAULT_VALUE = 256; diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/profiler/SiriusTasksKey.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/profiler/SiriusTasksKey.java index 7cec1efa96..b6ac6d3f01 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/profiler/SiriusTasksKey.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/profiler/SiriusTasksKey.java @@ -21,47 +21,47 @@ public final class SiriusTasksKey { /** * DDiagram category. */ - public static final String DIAGRAM_CAT = "DDiagram"; + public static final String DIAGRAM_CAT = "DDiagram"; //$NON-NLS-1$ /** * Acceleo category. */ - public static final String ACCELEO_CAT = "Acceleo"; + public static final String ACCELEO_CAT = "Acceleo"; //$NON-NLS-1$ /** * Draw2D category. */ - public static final String DRAW2D_CAT = "Draw2D"; + public static final String DRAW2D_CAT = "Draw2D"; //$NON-NLS-1$ /** * GEF category. */ - public static final String GEF_CAT = "GEF"; + public static final String GEF_CAT = "GEF"; //$NON-NLS-1$ /** * GMF category. */ - public static final String GMF_CAT = "GMF"; + public static final String GMF_CAT = "GMF"; //$NON-NLS-1$ /** * EMF category. */ - public static final String EMF_CAT = "EMF"; + public static final String EMF_CAT = "EMF"; //$NON-NLS-1$ /** * SWT category. */ - public static final String SWT_CAT = "SWT"; + public static final String SWT_CAT = "SWT"; //$NON-NLS-1$ /** * DTable category. */ - public static final String TABLE_CAT = "DTable"; + public static final String TABLE_CAT = "DTable"; //$NON-NLS-1$ /** * DTree category. */ - public static final String TREE_CAT = "DTree"; + public static final String TREE_CAT = "DTree"; //$NON-NLS-1$ /** * Metamodel extension category. diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/color/EnvironmentSystemColorFactory.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/color/EnvironmentSystemColorFactory.java index a2a0c7c460..07d18451d6 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/color/EnvironmentSystemColorFactory.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/api/ui/color/EnvironmentSystemColorFactory.java @@ -54,7 +54,7 @@ public final class EnvironmentSystemColorFactory { * @return return the color description corresponding to the color name. */ public SystemColor getSystemColorDescription(final String name) { - final String uri = SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors/@entries[name='" + name + "']"; + final String uri = SiriusUtil.VIEWPOINT_ENVIRONMENT_RESOURCE_URI + "#/0/@systemColors/@entries[name='" + name + "']"; //$NON-NLS-1$ //$NON-NLS-2$ final EObject color = EcoreUtil.create(DescriptionPackage.eINSTANCE.getSystemColor()); final URI colorURI = URI.createURI(uri); ((InternalEObject) color).eSetProxyURI(colorURI); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/uri/ViewpointProtocolParser.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/uri/ViewpointProtocolParser.java index bfa11bc33a..10340353ef 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/uri/ViewpointProtocolParser.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/uri/ViewpointProtocolParser.java @@ -45,7 +45,7 @@ public class ViewpointProtocolParser extends DescriptionResourceFactoryImpl { * found */ public static Viewpoint getViewpoint(final URI uri) throws ViewpointProtocolException { - if (uri.segmentCount() == 2 && "viewpoint".equals(uri.scheme())) { + if (uri.segmentCount() == 2 && "viewpoint".equals(uri.scheme())) { //$NON-NLS-1$ final Set<Viewpoint> viewpoints = ViewpointRegistry.getInstance().getViewpoints(); final String pluginName = URI.decode(uri.segment(0)); @@ -129,7 +129,7 @@ public class ViewpointProtocolParser extends DescriptionResourceFactoryImpl { if (resourceSetURi != null && resourceSetURi.isPlatform()) { final String uriPluginID = ViewpointProtocolParser.extractPluginID(resourceSetURi); final String viewpointName = ViewpointProtocolParser.extractViewpointName(resourceSetURi); - final String computedURI = "viewpoint:/" + uriPluginID + "/" + viewpointName; + final String computedURI = "viewpoint:/" + uriPluginID + "/" + viewpointName; //$NON-NLS-1$ //$NON-NLS-2$ result = URI.createURI(computedURI); } return result; @@ -137,7 +137,7 @@ public class ViewpointProtocolParser extends DescriptionResourceFactoryImpl { private static String extractViewpointName(final URI resourceSetURi) { final String fragment = resourceSetURi.fragment(); - final String viewpointNameSeparator = "'"; + final String viewpointNameSeparator = "'"; //$NON-NLS-1$ if (fragment.contains(viewpointNameSeparator)) { String name = fragment.substring(fragment.indexOf(viewpointNameSeparator) + 1); name = name.substring(0, name.indexOf(viewpointNameSeparator)); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractCommonToolToAppliedOnConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractCommonToolToAppliedOnConstraint.java index 8a3a1c7a91..d90efe1eb8 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractCommonToolToAppliedOnConstraint.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractCommonToolToAppliedOnConstraint.java @@ -35,10 +35,10 @@ public abstract class AbstractCommonToolToAppliedOnConstraint extends AbstractMo String text = getLabel(element); EObject container = element.eContainer(); while (container != null) { - text = getLabel(container) + " > " + text; + text = getLabel(container) + " > " + text; //$NON-NLS-1$ container = container.eContainer(); } - return "\"" + text + "\""; + return "\"" + text + "\""; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractMandatoryDomainClassConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractMandatoryDomainClassConstraint.java index 2fdc1eb529..776ebc6621 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractMandatoryDomainClassConstraint.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/AbstractMandatoryDomainClassConstraint.java @@ -26,7 +26,7 @@ import org.eclipse.sirius.tools.internal.validation.AbstractConstraint; public abstract class AbstractMandatoryDomainClassConstraint extends AbstractConstraint { /** The name of the DomainClass feature. */ - private static final String DOMAIN_CLASS_FEATURE = "domainClass"; + private static final String DOMAIN_CLASS_FEATURE = "domainClass"; //$NON-NLS-1$ /** * {@inheritDoc} diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java index 9cc5addaf1..4b6607ed50 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/tools/internal/validation/description/constraints/ValidImageConstraint.java @@ -44,7 +44,7 @@ public class ValidImageConstraint extends AbstractConstraint { // In the case of batch mode. if (ctx.getEventType() == EMFEventType.NULL) { EObject eObj = ctx.getTarget(); - String path = ""; + String path = ""; //$NON-NLS-1$ ArrayList<IStatus> statuses = new ArrayList<IStatus>(); ResourceSet rs = eObj.eResource().getResourceSet(); EList<EAttribute> attrs = eObj.eClass().getEAllAttributes(); diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/RGBValues.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/RGBValues.java index c421cab803..48bd850800 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/RGBValues.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/RGBValues.java @@ -42,7 +42,7 @@ public final class RGBValues { // CHECKSTYLE:ON - private static final String SEPARATOR = ","; + private static final String SEPARATOR = ","; //$NON-NLS-1$ private int red; |