diff options
author | Benoit Maggi | 2018-05-28 14:38:09 +0000 |
---|---|---|
committer | Benoit Maggi | 2018-05-28 14:39:27 +0000 |
commit | d7e31357e8f1e14738e4dc4db4bd53bf68dbd73b (patch) | |
tree | ce7c641afc12dab430907d26798c1ac0350f156b | |
parent | ddbb15e314ee64b6134cadfb9954ad06fb44c3c2 (diff) | |
download | org.eclipse.papyrus-d7e31357e8f1e14738e4dc4db4bd53bf68dbd73b.tar.gz org.eclipse.papyrus-d7e31357e8f1e14738e4dc4db4bd53bf68dbd73b.tar.xz org.eclipse.papyrus-d7e31357e8f1e14738e4dc4db4bd53bf68dbd73b.zip |
Bug 535209 - [Quality] Remove unused import/variable warning
- fix unused import
- move example code from src to src-gen
- remove unused variable
Change-Id: Ic2d49c57277cc08f1b53027876b4ceab1bea515d
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
118 files changed, 71 insertions, 172 deletions
diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/.classpath b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/.classpath index 7aed21cfec6..756f4289006 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/.classpath +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" path="src-gen"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="custom-src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties index 5b99c47bece..7067eba8d1d 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/build.properties @@ -1,5 +1,5 @@ -source.. = src/,\ - custom-src/ +source.. = src-gen/,\ + src/ output.. = bin/ bin.includes = META-INF/,\ .,\ diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/model/newdiagram.gmfgen b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/model/newdiagram.gmfgen index 242ad8b2a4e..bff3ce0e195 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/model/newdiagram.gmfgen +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/model/newdiagram.gmfgen @@ -7,7 +7,7 @@ domainFileExtension="PapyrusNewDiagram" dynamicTemplates="true" templateDirectory="/org.eclipse.papyrus.def/dynamic-templates3.5/codegen" - pluginDirectory="/org.eclipse.papyrus.example.diagram.simplediagram/src"> + pluginDirectory="/org.eclipse.papyrus.example.diagram.simplediagram/src-gen"> <diagram visualID="1000" editPartClassName="ModelEditPart" diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml index d0461bb76ac..7c112770bab 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/plugin.xml @@ -295,20 +295,6 @@ </editpartProvider> </extension> - <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider"> - <?gmfgen generated="true"?> - <modelingAssistantProvider class="org.eclipse.papyrus.example.diagram.simplediagram.providers.assistants.UMLModelingAssistantProviderOfModelEditPart"> - <Priority name="Lowest"/> - <object class="org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ModelEditPart" id="Model_1000"/> - <context elements="Model_1000"/> - </modelingAssistantProvider> - <modelingAssistantProvider class="org.eclipse.papyrus.example.diagram.simplediagram.providers.assistants.UMLModelingAssistantProviderOfComponentEditPart"> - <Priority name="Lowest"/> - <object class="org.eclipse.papyrus.example.diagram.simplediagram.edit.parts.ComponentEditPart" id="Component_2001"/> - <context elements="Component_2001"/> - </modelingAssistantProvider> -</extension> - <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider"> <?gmfgen generated="true"?> <IconProvider class="org.eclipse.papyrus.example.diagram.simplediagram.providers.UMLIconProvider"> diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/commands/ComponentCreateCommand.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/commands/ComponentCreateCommand.java index c38ddbc695e..c38ddbc695e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/commands/ComponentCreateCommand.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/commands/ComponentCreateCommand.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ComponentEditHelper.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ComponentEditHelper.java index 91b2a07c7c7..91b2a07c7c7 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ComponentEditHelper.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ComponentEditHelper.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ModelEditHelper.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ModelEditHelper.java index 73e0b2cceb3..73e0b2cceb3 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ModelEditHelper.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/ModelEditHelper.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java index 8fc17c2f6be..8fc17c2f6be 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/helpers/UMLBaseEditHelper.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentEditPart.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentEditPart.java index f2b2cc7f09f..f2b2cc7f09f 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentEditPart.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentEditPart.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java index fc86216f733..fc86216f733 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ComponentNameEditPart.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java index 678a49f74e4..678a49f74e4 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/ModelEditPart.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java index 4cc67802aa3..4cc67802aa3 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/parts/UMLEditPartFactory.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ComponentItemSemanticEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ComponentItemSemanticEditPolicy.java index 5461fac6226..5461fac6226 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ComponentItemSemanticEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ComponentItemSemanticEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelCanonicalEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelCanonicalEditPolicy.java index f95aaf49317..f95aaf49317 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelCanonicalEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelCanonicalEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelItemSemanticEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelItemSemanticEditPolicy.java index 995bf48180b..995bf48180b 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelItemSemanticEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/ModelItemSemanticEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java index 2a4c6781840..2a4c6781840 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLBaseItemSemanticEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java index 1115682394e..1115682394e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextNonResizableEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java index 16670d3f351..16670d3f351 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/edit/policies/UMLTextSelectionEditPolicy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLAbstractNavigatorItem.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLAbstractNavigatorItem.java index ccd8c283612..ccd8c283612 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLAbstractNavigatorItem.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLAbstractNavigatorItem.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorContentProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorContentProvider.java index 288a70b01ef..288a70b01ef 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorContentProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorContentProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorItem.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorItem.java index e2b0cd94ef3..e2b0cd94ef3 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorItem.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorItem.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorLabelProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorLabelProvider.java index 54d0bcc36ff..54d0bcc36ff 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorLabelProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLDomainNavigatorLabelProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorActionProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorActionProvider.java index 4a334567c98..4a334567c98 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorActionProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorActionProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorContentProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorContentProvider.java index 420181e6e89..420181e6e89 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorContentProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorContentProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorGroup.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorGroup.java index 61a2a0b9a1f..61a2a0b9a1f 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorGroup.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorGroup.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorItem.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorItem.java index 751e8a1fc10..751e8a1fc10 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorItem.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorItem.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLabelProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLabelProvider.java index af8e02de682..af8e02de682 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLabelProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLabelProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLinkHelper.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLinkHelper.java index d5706be791b..d5706be791b 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLinkHelper.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorLinkHelper.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorSorter.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorSorter.java index b2dd5ee161e..b2dd5ee161e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorSorter.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/navigator/UMLNavigatorSorter.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java index dbcb00f1c27..dbcb00f1c27 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/parsers/AbstractParser.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java index e233f14d26e..e233f14d26e 100755 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/parsers/MessageFormatParser.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/DiagramEditorContextMenuProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/DiagramEditorContextMenuProvider.java index 1c4eb01f7a1..1c4eb01f7a1 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/DiagramEditorContextMenuProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/DiagramEditorContextMenuProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java index 2b95f2bc404..2b95f2bc404 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/LoadResourceAction.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/Messages.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/Messages.java index 94e886511fe..94e886511fe 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/Messages.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/Messages.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java index 06722211dc6..06722211dc6 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/ModelElementSelectionPage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizard.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizard.java index 89cfd4ff84c..89cfd4ff84c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizard.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizard.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizardPage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizardPage.java index b95164e227e..b95164e227e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizardPage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLCreationWizardPage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramActionBarContributor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramActionBarContributor.java index 2eb135fa1b6..2eb135fa1b6 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramActionBarContributor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramActionBarContributor.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditor.java index 0f162d53034..0f162d53034 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditor.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java index d95ab2f9bd5..d95ab2f9bd5 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorPlugin.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java index 1232543e24a..1232543e24a 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramEditorUtil.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdateCommand.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdateCommand.java index dbc5b6a41ce..dbc5b6a41ce 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdateCommand.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdateCommand.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java index 503d2d1c243..503d2d1c243 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDiagramUpdater.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDocumentProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDocumentProvider.java index ce436755b6b..ce436755b6b 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDocumentProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLDocumentProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLInitDiagramFileAction.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLInitDiagramFileAction.java index f3143a6c8b2..f3143a6c8b2 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLInitDiagramFileAction.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLInitDiagramFileAction.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java index 3a3ee2cb657..3a3ee2cb657 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLLinkDescriptor.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLMatchingStrategy.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLMatchingStrategy.java index 206e129aeb9..206e129aeb9 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLMatchingStrategy.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLMatchingStrategy.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNewDiagramFileWizard.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNewDiagramFileWizard.java index 522b6e47c2e..522b6e47c2e 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNewDiagramFileWizard.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNewDiagramFileWizard.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java index a25c5f511a8..a25c5f511a8 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLNodeDescriptor.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java index 9d9635a25b0..9d9635a25b0 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLPaletteFactory.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLUriEditorInputTester.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLUriEditorInputTester.java index a8abbe4ecc2..a8abbe4ecc2 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLUriEditorInputTester.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLUriEditorInputTester.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java index cc121e9e93a..cc121e9e93a 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/part/UMLVisualIDRegistry.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramAppearancePreferencePage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramAppearancePreferencePage.java index 702fca73f48..702fca73f48 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramAppearancePreferencePage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramAppearancePreferencePage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramConnectionsPreferencePage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramConnectionsPreferencePage.java index 9c55962375f..9c55962375f 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramConnectionsPreferencePage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramConnectionsPreferencePage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramGeneralPreferencePage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramGeneralPreferencePage.java index 4e504d2b89b..4e504d2b89b 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramGeneralPreferencePage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramGeneralPreferencePage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPreferenceInitializer.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPreferenceInitializer.java index b108394986c..b108394986c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPreferenceInitializer.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPreferenceInitializer.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPrintingPreferencePage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPrintingPreferencePage.java index dde3842609c..dde3842609c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPrintingPreferencePage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramPrintingPreferencePage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramRulersAndGridPreferencePage.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramRulersAndGridPreferencePage.java index b33ebd50fcb..b33ebd50fcb 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramRulersAndGridPreferencePage.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/preferences/DiagramRulersAndGridPreferencePage.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/ElementInitializers.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/ElementInitializers.java index f8f27fad0bb..f8f27fad0bb 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/ElementInitializers.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/ElementInitializers.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java index 170cad7eca3..170cad7eca3 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLEditPartProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java index bf8a3f8b082..bf8a3f8b082 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLElementTypes.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java index 9a5a0b36b21..9a5a0b36b21 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLIconProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLParserProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLParserProvider.java index 51fdad3fb97..51fdad3fb97 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLParserProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLParserProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLViewProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLViewProvider.java index 54c4d8eeb17..54c4d8eeb17 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLViewProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/providers/UMLViewProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java index c4bc608194b..c4bc608194b 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLPropertySection.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLSheetLabelProvider.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLSheetLabelProvider.java index 33611df694c..33611df694c 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLSheetLabelProvider.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src-gen/org/eclipse/papyrus/example/diagram/simplediagram/sheet/UMLSheetLabelProvider.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/CreateDiagramCommand.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/CreateDiagramCommand.java index 738a2cda6b8..738a2cda6b8 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/CreateDiagramCommand.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/CreateDiagramCommand.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/DiagramEditorFactory.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/DiagramEditorFactory.java index f376b170b50..f376b170b50 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/DiagramEditorFactory.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/DiagramEditorFactory.java diff --git a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/UmlDiagramForMultiEditor.java b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/UmlDiagramForMultiEditor.java index 26b2e620059..26b2e620059 100644 --- a/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/custom-src/org/eclipse/papyrus/example/diagram/simplediagram/UmlDiagramForMultiEditor.java +++ b/examples/others/org.eclipse.papyrus.example.diagram.simplediagram/src/org/eclipse/papyrus/example/diagram/simplediagram/UmlDiagramForMultiEditor.java diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/FacetUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/FacetUtils.java index 6c802e8dc87..6ac8c84cdb5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/FacetUtils.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.core/src/org/eclipse/papyrus/emf/facet/efacet/core/FacetUtils.java @@ -48,9 +48,7 @@ import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.ETypedElement; -import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.emf.facet.efacet.core.exception.FacetManagerException; -import org.eclipse.papyrus.emf.facet.efacet.core.internal.exported.IResolverManager; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet; import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetOperation; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java index 9b6e3bbb557..18ff697a452 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/commands/CreateEditBasedElementCommand.java @@ -24,7 +24,6 @@ import org.eclipse.core.commands.operations.IUndoableOperation; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java index d988eb6f44c..a3718d020d0 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/PapyrusWrappingLabel.java @@ -16,7 +16,6 @@ package org.eclipse.papyrus.infra.gmfdiag.common.figure.node; import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel; import org.eclipse.papyrus.infra.gmfdiag.common.figure.IPapyrusWrappingLabel; import org.eclipse.swt.graphics.Image; @@ -115,7 +114,4 @@ public class PapyrusWrappingLabel extends WrappingLabel implements IPapyrusWrapp } - - - } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java index 8b9a39d2716..b2da4999d49 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/selection/SelectSeveralLinksEditPartTracker.java @@ -55,8 +55,6 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker { private String type; private boolean bSourceFeedback = false; - private PrecisionRectangle sourceRectangle; - private Point originalLocation = null; protected HashMap<EditPart, Point> locationsForEditParts= new HashMap<EditPart, Point>(); int[] relativePosition=null; @@ -79,6 +77,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker { * (non-Javadoc) * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int) */ + @Override protected boolean handleButtonDown(int button) { if (!super.handleButtonDown(button)) return false; @@ -173,8 +172,6 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker { * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted() */ protected boolean handleDragStarted() { - originalLocation = null; - sourceRectangle = null; return stateTransition(STATE_DRAG, STATE_DRAG_IN_PROGRESS); } @@ -314,6 +311,7 @@ public class SelectSeveralLinksEditPartTracker extends SelectEditPartTracker { * (non-Javadoc) * @see org.eclipse.gef.tools.AbstractTool#getCommand() */ + @Override protected Command getCommand() { List editparts = getOperationSet(); EditPart part; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java index 6fa4269e505..7aaed6aa50b 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/ExtendedPluginPaletteProvider.java @@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.gef.RootEditPart; import org.eclipse.gef.Tool; import org.eclipse.gef.palette.CombinedTemplateCreationEntry; import org.eclipse.gef.palette.PaletteContainer; @@ -49,8 +48,6 @@ import org.eclipse.gmf.runtime.common.core.service.AbstractProvider; import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.ContributeToPaletteOperation; import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry; -import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor; -import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer; import org.eclipse.gmf.runtime.diagram.ui.services.palette.IPaletteProvider; import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory; import org.eclipse.gmf.runtime.gef.ui.internal.palette.PaletteStack; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java index de2e3fbd81f..84f3b8dbb17 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/LegacyOwnerObservable.java @@ -21,7 +21,6 @@ import org.eclipse.core.databinding.observable.value.ValueDiff; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.edit.domain.EditingDomain; diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java index 09dac6d408c..b16cb801f33 100755 --- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java +++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/EStructuralFeatureSyncDispatcher.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.infra.sync; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; /** diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties index 456eaaeae82..c2623bdd9c6 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/build.properties @@ -16,6 +16,7 @@ bin.includes = .,\ plugin.properties,\ about.html jars.compile.order = . -source.. = src-gen/ +source.. = src-gen/,\ + src/ output.. = bin/ src.includes = about.html diff --git a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java index bc9b985a8e7..2d11cc21522 100644 --- a/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java +++ b/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui/src/org/eclipse/papyrus/infra/properties/ui/creation/EcorePropertyEditorFactory.java @@ -35,10 +35,8 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.window.Window; -import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.EClassNameComparator; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; -import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; import org.eclipse.papyrus.infra.properties.contexts.View; import org.eclipse.papyrus.infra.properties.internal.ui.Activator; import org.eclipse.papyrus.infra.properties.internal.ui.messages.Messages; @@ -555,7 +553,7 @@ public class EcorePropertyEditorFactory extends PropertyEditorFactory { private EObject context; - private List<Object> createdElements = new ArrayList<Object>(2); // Anticipate small depth of dialog nesting + private List<Object> createdElements = new ArrayList<>(2); // Anticipate small depth of dialog nesting EObjectCreationContext(EObject context) { this.context = context; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java index 1f602aa6f40..2b83d897601 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/infra/services/edit/service/ElementEditServiceUtils.java @@ -19,7 +19,6 @@ import java.util.Map; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IStatus; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.transaction.RollbackException; import org.eclipse.emf.transaction.Transaction; diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/DiagramOfViewLabelProvider.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/DiagramOfViewLabelProvider.java index 1efeefdc761..5897b9038bb 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/DiagramOfViewLabelProvider.java +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.viewlabelprovider/src/org/eclipse/papyrus/infra/services/viewlabelprovider/provider/DiagramOfViewLabelProvider.java @@ -13,7 +13,6 @@ package org.eclipse.papyrus.infra.services.viewlabelprovider.provider; -import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.core.services.ServiceException; @@ -36,6 +35,7 @@ public class DiagramOfViewLabelProvider extends ViewLabelProvider { * @param element * @return */ + @Override public Image getImage(Object element) { if (element instanceof View) { Diagram diagram = ((View) element).getDiagram(); @@ -60,6 +60,7 @@ public class DiagramOfViewLabelProvider extends ViewLabelProvider { * @param element * @return */ + @Override public String getText(Object element) { if (element instanceof View) { Diagram diagram = ((View) element).getDiagram(); diff --git a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java index c6de517c2b4..ab99a99cd9f 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java @@ -56,6 +56,7 @@ public class CreateAndEditTableConfigurationWizard extends EditTableConfiguratio * @see org.eclipse.papyrus.customization.nattableconfiguration.wizards.EditTableConfigurationWizard#addEditNattableConfigurationPage() * */ + @Override protected void addEditNattableConfigurationPage() { addPage(this.page = new NattableConfigurationFileCreationPage(this.helper)); } @@ -66,6 +67,7 @@ public class CreateAndEditTableConfigurationWizard extends EditTableConfiguratio * @return * the edited table configuration. */ + @Override protected TableConfiguration getEditedTableConfiguration(final Resource resource) { // 1. create the configuration itself TableConfiguration configuration = NattableconfigurationFactory.eINSTANCE.createTableConfiguration(); diff --git a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java index e0aa11f82d4..cc70bbeca9d 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java +++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java @@ -126,7 +126,7 @@ public class EditTableConfigurationWizard extends AbstractTableWizard implements // TODO required ? final IEditorPart currentPart = WorkbenchPartHelper.getCurrentActiveWorkbenchPart().getSite().getPage().getActiveEditor(); if (null != currentPart) { - manager = (INattableModelManager) currentPart.getAdapter(INattableModelManager.class); + manager = currentPart.getAdapter(INattableModelManager.class); } if (null != manager) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/LayoutUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/LayoutUtils.java index 09c3556f3f5..76fa4f7e5e7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/LayoutUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/layout/LayoutUtils.java @@ -30,7 +30,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart; import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; import org.eclipse.gmf.runtime.draw2d.ui.figures.IOvalAnchorableFigure; -import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.papyrus.extensionpoints.editors.Activator; import org.eclipse.papyrus.uml.diagram.common.util.Util; @@ -41,39 +40,39 @@ import org.eclipse.papyrus.uml.diagram.common.util.Util; */ public class LayoutUtils { - public final static String alignementCmdId = "org.eclipse.papyrus.uml.diagram.common.commands.AlignmentCommand"; //$NON-NLS-1$ + public static final String alignementCmdId = "org.eclipse.papyrus.uml.diagram.common.commands.AlignmentCommand"; //$NON-NLS-1$ - public final static String routingCmdId = "org.eclipse.papyrus.uml.diagram.common.commands.RoutingCommand"; //$NON-NLS-1$ + public static final String routingCmdId = "org.eclipse.papyrus.uml.diagram.common.commands.RoutingCommand"; //$NON-NLS-1$ /** the parameter for the left command (alignment and routing command) */ - final public static String LEFT = "parameter_left"; //$NON-NLS-1$ + public static final String LEFT = "parameter_left"; //$NON-NLS-1$ /** the parameter for the right commands (alignment and routing command) */ - final public static String RIGHT = "parameter_right"; //$NON-NLS-1$ + public static final String RIGHT = "parameter_right"; //$NON-NLS-1$ /** the parameter for the top commands (alignment and routing command) */ - final public static String TOP = "parameter_top"; //$NON-NLS-1$ + public static final String TOP = "parameter_top"; //$NON-NLS-1$ /** the parameter for the bottom commands (alignment and routing command) */ - final public static String BOTTOM = "parameter_bottom"; //$NON-NLS-1$ + public static final String BOTTOM = "parameter_bottom"; //$NON-NLS-1$ /** the parameter for the center alignment */ - final public static String CENTER = "parameter_center"; //$NON-NLS-1$ + public static final String CENTER = "parameter_center"; //$NON-NLS-1$ /** the parameter for the horizontal distribution */ - final public static String MIDDLE = "parameter_middle"; //$NON-NLS-1$ + public static final String MIDDLE = "parameter_middle"; //$NON-NLS-1$ /** the parameter for the horizontal distribution */ - final public static String HORIZONTALLY = "parameter_horizontally"; //$NON-NLS-1$ + public static final String HORIZONTALLY = "parameter_horizontally"; //$NON-NLS-1$ /** the parameter for the horizontal distribution between nodes */ - final public static String HORIZONTALLY_BETWEEN_NODES = "parameter_horizontally_between_nodes"; //$NON-NLS-1$ + public static final String HORIZONTALLY_BETWEEN_NODES = "parameter_horizontally_between_nodes"; //$NON-NLS-1$ /** the parameter for the vertical distribution */ - final public static String VERTICALLY = "parameter_vertically"; //$NON-NLS-1$ + public static final String VERTICALLY = "parameter_vertically"; //$NON-NLS-1$ /** the parameter for the vertical distribution between nodes */ - final public static String VERTICALLY_BETWEEN_NODES = "parameter_vertically_between_nodes"; //$NON-NLS-1$ + public static final String VERTICALLY_BETWEEN_NODES = "parameter_vertically_between_nodes"; //$NON-NLS-1$ /** * the shift to avoid the scrollbar If there is no scrollBar, set @@ -201,24 +200,24 @@ public class LayoutUtils { return position; } - private final static int[] northArray = { PositionConstants.NORTH, PositionConstants.NORTH_EAST, PositionConstants.NORTH_WEST }; + private static final int[] northArray = { PositionConstants.NORTH, PositionConstants.NORTH_EAST, PositionConstants.NORTH_WEST }; - private final static int[] southArray = { PositionConstants.SOUTH, PositionConstants.SOUTH_EAST, PositionConstants.SOUTH_WEST }; + private static final int[] southArray = { PositionConstants.SOUTH, PositionConstants.SOUTH_EAST, PositionConstants.SOUTH_WEST }; - private final static int[] eastArray = { PositionConstants.EAST, PositionConstants.NORTH_EAST, PositionConstants.SOUTH_EAST }; + private static final int[] eastArray = { PositionConstants.EAST, PositionConstants.NORTH_EAST, PositionConstants.SOUTH_EAST }; - private final static int[] westArray = { PositionConstants.WEST, PositionConstants.NORTH_WEST, PositionConstants.SOUTH_WEST }; + private static final int[] westArray = { PositionConstants.WEST, PositionConstants.NORTH_WEST, PositionConstants.SOUTH_WEST }; - public final static List<Integer> northPositions = fillList(northArray); + public static final List<Integer> northPositions = fillList(northArray); - public final static List<Integer> southPositions = fillList(southArray); + public static final List<Integer> southPositions = fillList(southArray); - public final static List<Integer> eastPositions = fillList(eastArray); + public static final List<Integer> eastPositions = fillList(eastArray); - public final static List<Integer> westPositions = fillList(westArray); + public static final List<Integer> westPositions = fillList(westArray); private static List<Integer> fillList(int[] array) { - List<Integer> list = new ArrayList<Integer>(); + List<Integer> list = new ArrayList<>(); for (int i = 0; i < array.length; i++) { list.add(new Integer(array[i])); } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramDecorationAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramDecorationAdapter.java index a42dd10f4f4..3c0c9ad1b46 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramDecorationAdapter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/providers/DiagramDecorationAdapter.java @@ -22,7 +22,6 @@ import org.eclipse.draw2d.Locator; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PrecisionRectangle; import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.emf.common.util.BasicEList; import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.handles.HandleBounds; @@ -100,7 +99,7 @@ public class DiagramDecorationAdapter { * the message * @return the tool tip */ - final public Label getToolTip(String message) { + public final Label getToolTip(String message) { return new Label(message); } @@ -115,7 +114,7 @@ public class DiagramDecorationAdapter { * the is volatile * @return the set of JFace decorations */ - final public List<IDecoration> setDecorationsNode(List<IPapyrusDecoration> pDecorations, int margin, boolean isVolatile) { + public final List<IDecoration> setDecorationsNode(List<IPapyrusDecoration> pDecorations, int margin, boolean isVolatile) { decorations.clear(); for (IPapyrusDecoration pDecoration : pDecorations) { @@ -124,8 +123,6 @@ public class DiagramDecorationAdapter { margin += image.getBounds().width; } } - // this.pDecorations = pDecorations; - return decorations; } @@ -141,7 +138,7 @@ public class DiagramDecorationAdapter { * the is volatile * @return the set of JFace decorations */ - final public List<IDecoration> setDecorationsEdge(List<IPapyrusDecoration> pDecorations, int percentageFromSource, boolean isVolatile) { + public final List<IDecoration> setDecorationsEdge(List<IPapyrusDecoration> pDecorations, int percentageFromSource, boolean isVolatile) { final int distBetweenIconsPercent = 20; final int percentageMin = 10; @@ -177,7 +174,7 @@ public class DiagramDecorationAdapter { * whether volatile (typically true) * @return */ - final public Image addDecorationNode(IPapyrusDecoration pDecoration, int margin, boolean isVolatile) { + public final Image addDecorationNode(IPapyrusDecoration pDecoration, int margin, boolean isVolatile) { if (margin == -1) { margin = 0; @@ -191,7 +188,7 @@ public class DiagramDecorationAdapter { return addDecoration(pDecoration, 0, margin, true); } - final public Image addDecoration(IPapyrusDecoration pDecoration, int percentageFromSource, int margin, boolean isVolatile) { + public final Image addDecoration(IPapyrusDecoration pDecoration, int percentageFromSource, int margin, boolean isVolatile) { // use image registry, see bug 401056 Image image = Activator.getPluginIconImage(Activator.ID, pDecoration.getDecorationImageForGE()); IDecoration decoration = createDecorationImage(decoratorTarget, image, percentageFromSource, margin, isVolatile); @@ -218,7 +215,7 @@ public class DiagramDecorationAdapter { * @param Decoration * the decoration */ - final public void removeDecoration(IDecoration decoration) { + public final void removeDecoration(IDecoration decoration) { if ((decoration == null) || (decoratorTarget == null)) { return; } @@ -258,7 +255,7 @@ public class DiagramDecorationAdapter { * the is volatile * @return the decoration */ - final public IDecoration createDecorationImage(IDecoratorTarget decoratorTarget, Image image, int percentageFromSource, int margin, boolean isVolatile) { + public final IDecoration createDecorationImage(IDecoratorTarget decoratorTarget, Image image, int percentageFromSource, int margin, boolean isVolatile) { final View view = (View) decoratorTarget.getAdapter(View.class); org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration decoration = null; if (view == null || view.eResource() == null || image == null) { @@ -331,14 +328,14 @@ public class DiagramDecorationAdapter { * the is volatile * @return the decoration */ - final public IDecoration createDecorationFigure(IDecoratorTarget decoratorTarget, IFigure figure, int percentageFromSource, int margin, boolean isVolatile) { + public final IDecoration createDecorationFigure(IDecoratorTarget decoratorTarget, IFigure figure, int percentageFromSource, int margin, boolean isVolatile) { - final View view = (View) decoratorTarget.getAdapter(View.class); + final View view = decoratorTarget.getAdapter(View.class); org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoration decoration = null; if (view == null || view.eResource() == null || figure == null) { return decoration; } - EditPart editPart = (EditPart) decoratorTarget.getAdapter(EditPart.class); + EditPart editPart = decoratorTarget.getAdapter(EditPart.class); if (editPart == null || editPart.getViewer() == null) { return decoration; } @@ -421,7 +418,7 @@ public class DiagramDecorationAdapter { /** * Gets the direction. - * + * @deprecated * @param position * the position * @return the direction diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/AbstractChangeInteractionTypeCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/AbstractChangeInteractionTypeCommand.java index 2b4f7bf76d6..2173dcf8550 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/AbstractChangeInteractionTypeCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/AbstractChangeInteractionTypeCommand.java @@ -20,8 +20,6 @@ import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPartViewer; -import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java index 6cc5d03aa5d..73901dd4cd3 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src/org/eclipse/papyrus/uml/diagram/interactionoverview/edit/commands/DropInteractionWithSnapshotCommand.java @@ -16,8 +16,6 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.gef.EditPartViewer; -import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; @@ -37,7 +35,7 @@ public class DropInteractionWithSnapshotCommand extends protected CallBehaviorAction callBehaviorAction; public DropInteractionWithSnapshotCommand(final TransactionalEditingDomain domain, final IGraphicalEditPart parentEditPart, CallBehaviorAction callBehaviorAction, final String commandLabel) { - super(domain, commandLabel, Collections.EMPTY_LIST); + super(domain, commandLabel, Collections.emptyList()); this.parentEditPart = parentEditPart; this.callBehaviorAction = callBehaviorAction; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java index a25f4e4e45f..800f86195e9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java @@ -33,7 +33,6 @@ import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gef.requests.ReconnectRequest; import org.eclipse.gmf.runtime.common.core.util.Log; import org.eclipse.gmf.runtime.common.core.util.Trace; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy; import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions; import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin; @@ -58,7 +57,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.uml.diagram.common.editparts.RoundedCompartmentEditPart; import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.AppliedStereotypeCommentCreationEditPolicyEx; -import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDLifelineXYLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.SequenceReferenceEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UpdateConnectionReferenceEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UpdateWeakReferenceForExecSpecEditPolicy; @@ -68,7 +66,6 @@ import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.BoundForEdit import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectExecutionToGridEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectYCoordinateToGrillingEditPolicy; import org.eclipse.papyrus.uml.diagram.sequence.util.CoordinateReferentialUtils; -import org.eclipse.papyrus.uml.diagram.sequence.util.LifelineEditPartUtil; import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies.AppliedStereotypeCommentEditPolicy; import org.eclipse.swt.graphics.Color; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java index 5bfc11a71e3..d88f4d44038 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineGraphicalNodeEditPolicy.java @@ -27,7 +27,6 @@ import org.eclipse.draw2d.geometry.PrecisionPoint; import org.eclipse.draw2d.geometry.PrecisionRectangle; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.gef.ConnectionEditPart; import org.eclipse.gef.EditPart; import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java index 81e0d9b7e6e..54c9a22667e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java @@ -246,7 +246,6 @@ public class LifelineHeadUtil { List<?> sourceConnections = editPart.getSourceConnections(); for (Object object : sourceConnections) { ConnectionEditPart conn = (ConnectionEditPart) object; - EditPart target = conn.getTarget(); if (object instanceof MessageLostEditPart) { Command command = getMoveAnchorCommand(conn, moveDelta, false); commands.appendIfCanExecute(command); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java index 3b2846a5553..3907386ebef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/custom-src/org/eclipse/papyrus/uml/diagram/timing/custom/utils/LifelineUtils.java @@ -107,6 +107,7 @@ public final class LifelineUtils { * the Lifeline to update * @param lifelineView * the Lifeline's view, containing the StateDefinitions (ignored for a Compact lifeline) + * */ @SuppressWarnings("boxing") public static void updateFragmentNames(final Lifeline lifeline, final View lifelineView) { diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java index ae37f34c492..2a4cdab0954 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java +++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/validator/ParticipantValidator.java @@ -22,8 +22,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.papyrus.infra.core.resource.ModelUtils; import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Model; diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java index 041f17318cf..41f383934ef 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialog.java @@ -3,7 +3,6 @@ package org.eclipse.papyrus.uml.profile.drafter.ui.dialog; import java.util.ArrayList; import java.util.List; -import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.observable.value.IObservableValue; @@ -45,11 +44,7 @@ import org.eclipse.uml2.uml.NamedElement; * */ public class StereotypeUpdateDialog extends Dialog { - private Binding stereotypeNameBinding; - private Binding profileNameBinding; - private Binding stereotypeBinding; private DataBindingContext m_bindingContext; - private org.eclipse.core.databinding.Binding profileBinding; private Text quickSetText; private Text stereotypeText; private Text profileText; diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java index 3eb6b9c07af..4ceb6f75eac 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/dialog/StereotypeUpdateDialogOld.java @@ -93,7 +93,6 @@ public class StereotypeUpdateDialogOld extends Dialog { */ @Override protected Control createDialogArea(Composite parent) { - Stereotype stereotype; List<Stereotype> appliedStereotypes = anyUmlElement.getAppliedStereotypes(); Composite container = (Composite) super.createDialogArea(parent); diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java index 61934f42cfc..aeb3b0686c8 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/ui/handler/UpdateProfileHandler.java @@ -64,7 +64,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { */ private StereoptypeModel stereoptypeModel; - private String taggedValeNameInput; /** * Constructor. @@ -141,7 +140,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { stereotypeNameInput = updateArgs.getStereotypeName(); profileNameInput = updateArgs.getProfileName(); - taggedValeNameInput = ""; return true; } @@ -217,7 +215,6 @@ public class UpdateProfileHandler extends AbstractProfileBaseHandler { cachedSelectionAsNamedElement = null; stereotypeNameInput = null; profileNameInput = null; - taggedValeNameInput = null; } /** diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java index 4232ba54dc1..9a6f6cd8d0b 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/src/org/eclipse/papyrus/uml/profile/drafter/utils/UMLPrimitiveTypesModel.java @@ -4,17 +4,14 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.papyrus.uml.extensionpoints.Registry; import org.eclipse.papyrus.uml.extensionpoints.library.IRegisteredLibrary; -import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile; import org.eclipse.papyrus.uml.profile.drafter.exceptions.NotFoundException; -import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.Package; +import org.eclipse.uml2.uml.Type; /** diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/commands/UnapplyStereotypeCommand.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/commands/UnapplyStereotypeCommand.java index 6431cffde95..624661207c5 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/commands/UnapplyStereotypeCommand.java +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/commands/UnapplyStereotypeCommand.java @@ -14,8 +14,6 @@ package org.eclipse.papyrus.uml.tools.commands; import java.util.Collection; import java.util.Collections; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.impl.NotificationImpl; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.uml2.uml.Element; diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java index f4267e9abe5..5b582df2d4e 100755 --- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java +++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/src/org/eclipse/papyrus/infra/nattable/views/tests/tests/TableVerifyContents.java @@ -77,8 +77,6 @@ public class TableVerifyContents extends AbstractPapyrusTest { private static IMultiDiagramEditor papyrusEditor; - private static final String BUNDLE_ID = Activator.getDefault().getBundle().getSymbolicName(); - private static Model rootModel; private static Model subModel; diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug488744_PortPositionTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug488744_PortPositionTest.java index 5f2dcc6bd2e..7efcc57aff1 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug488744_PortPositionTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/src/org/eclipse/papyrus/uml/diagram/common/tests/tests/Bug488744_PortPositionTest.java @@ -19,10 +19,8 @@ import java.util.Iterator; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java index 1f0348394a5..82eac9f6eac 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestDisplayAsBrace.java @@ -115,10 +115,6 @@ public class TestDisplayAsBrace extends AbstractPapyrusTestCase { // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; - // CREATION assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestReopenAsBrace.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestReopenAsBrace.java index 21235fa6e17..81a7318ecb2 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestReopenAsBrace.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/asbrace/TestReopenAsBrace.java @@ -51,13 +51,13 @@ public class TestReopenAsBrace extends AbstractPapyrusTestCase { /** name of the test model */ public final String FILE_NAME = "TestReopenAsBraceTest.di"; - final static String MODEL_DI = "resource/ReopenFileBrace.di"; //$NON-NLS-1$ + static final String MODEL_DI = "resource/ReopenFileBrace.di"; //$NON-NLS-1$ - final static String STEREOTYPEDCLASS = "StereotypedClass"; //$NON-NLS-1$ - final static String CLASS1 = "Class1"; //$NON-NLS-1$ - final static String STEREOTYPEDLINK = "StereotypedLink"; //$NON-NLS-1$ + static final String STEREOTYPEDCLASS = "StereotypedClass"; //$NON-NLS-1$ + static final String CLASS1 = "Class1"; //$NON-NLS-1$ + static final String STEREOTYPEDLINK = "StereotypedLink"; //$NON-NLS-1$ - final static String PROFILE = "testProfile"; //$NON-NLS-1$ + static final String PROFILE = "testProfile"; //$NON-NLS-1$ private IMultiDiagramEditor editor; @@ -71,15 +71,14 @@ public class TestReopenAsBrace extends AbstractPapyrusTestCase { View appliedStereotypeBraceNotation = null; editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); GraphicalEditPart stereotypedClassEditPart = (GraphicalEditPart) fixture.findEditPart(stereotypedClass); // look for the applied stereotype compartment - View NotationClass1 = stereotypedClassEditPart.getNotationView(); - for (int i = 0; i < NotationClass1.getChildren().size(); i++) { - View view = (View) NotationClass1.getChildren().get(i); + View notationClass1 = stereotypedClassEditPart.getNotationView(); + for (int i = 0; i < notationClass1.getChildren().size(); i++) { + View view = (View) notationClass1.getChildren().get(i); if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_BRACE_TYPE)) { appliedStereotypeBraceNotation = view; } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java index cf48b962047..12d915d88ca 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestDisplayAsComment.java @@ -116,10 +116,6 @@ public class TestDisplayAsComment extends AbstractPapyrusTestCase { // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; - // CREATION assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestReopenAsComment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestReopenAsComment.java index 9328cdf7e4a..ff49c592094 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestReopenAsComment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascomment/TestReopenAsComment.java @@ -73,7 +73,6 @@ public class TestReopenAsComment extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java index 100e86a96bf..e953b535f12 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestDisplayAsCompartment.java @@ -115,10 +115,6 @@ public class TestDisplayAsCompartment extends AbstractPapyrusTestCase { // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; - // CREATION assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenAsCompartment.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenAsCompartment.java index 6d8c836746b..89581fd7efc 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenAsCompartment.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenAsCompartment.java @@ -70,7 +70,6 @@ public class TestReopenAsCompartment extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithCSS.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithCSS.java index 05da015c672..b6e480e0baf 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithCSS.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithCSS.java @@ -73,7 +73,6 @@ public class TestReopenWithCSS extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithPropertyView.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithPropertyView.java index d6e89c9d1a5..c03ea60b125 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithPropertyView.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestReopenWithPropertyView.java @@ -73,7 +73,6 @@ public class TestReopenWithPropertyView extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyProfile.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyProfile.java index 03b99020d0e..b5cafc0ee8a 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyProfile.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyProfile.java @@ -73,7 +73,6 @@ public class TestUnapplyProfile extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyStereotype.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyStereotype.java index 3a0c92d3fc0..9650cb97b48 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyStereotype.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUnapplyStereotype.java @@ -73,7 +73,6 @@ public class TestUnapplyStereotype extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model {// test the node class edipart NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUpdateValue.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUpdateValue.java index 092b9a4075c..b78057bde12 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUpdateValue.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/ascompartment/TestUpdateValue.java @@ -73,7 +73,6 @@ public class TestUpdateValue extends AbstractPapyrusTestCase { editor = fixture.getEditor(MODEL_DI); fixture.openDiagram("ClassDiagram"); //$NON-NLS-1$ - boolean isPresent = false; // Check initial model // test the node class edipart final NamedElement stereotypedClass = fixture.getModel().getOwnedMember(STEREOTYPEDCLASS); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java index 6cd70bb0c87..95ffe4d3d51 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/Test2StereotypeApplications.java @@ -100,7 +100,7 @@ public class Test2StereotypeApplications extends AbstractPapyrusTestCase { // stereotype that is applied on class1 Stereotype stereotypeTest = null; // view of the class - View NotationClass1 = null; + View notationClass1 = null; // editpart of class1 GraphicalEditPart classEditPart = null; // compartment of stereotype @@ -112,9 +112,6 @@ public class Test2StereotypeApplications extends AbstractPapyrusTestCase { // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; // CREATION @@ -162,10 +159,10 @@ public class Test2StereotypeApplications extends AbstractPapyrusTestCase { } // look for the applied stereotype compartment - NotationClass1 = classEditPart.getNotationView(); + notationClass1 = classEditPart.getNotationView(); - for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) { - View view = (View) NotationClass1.getTransientChildren().get(i); + for (int i = 0; i < notationClass1.getTransientChildren().size(); i++) { + View view = (View) notationClass1.getTransientChildren().get(i); if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) { appliedStereotypeCompartmentNotation = view; } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java index eaa1e9f0a7e..446fb31172c 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplication.java @@ -122,10 +122,6 @@ public class TestStereotypeApplication extends AbstractPapyrusTestCase { // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; - // CREATION assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java index e64e8f28e46..15f95841b03 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/tests/displayname/TestStereotypeApplicationQualifiedName.java @@ -103,7 +103,7 @@ public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestC // stereotype that is applied on class1 Stereotype stereotypeTest = null; // view of the class - View NotationClass1 = null; + View notationClass1 = null; // editpart of class1 GraphicalEditPart classEditPart = null; // compartment of stereotype @@ -115,10 +115,6 @@ public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestC // compartment Shape View shapeCompartmentView = null; - // the view of the applied stereotype property - View stereotypePropertyView = null; - GraphicalEditPart stereotypeClassLabelEditPart = null; - // CREATION assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0); @@ -155,10 +151,10 @@ public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestC } // look for the applied stereotype compartment - NotationClass1 = classEditPart.getNotationView(); + notationClass1 = classEditPart.getNotationView(); - for (int i = 0; i < NotationClass1.getTransientChildren().size(); i++) { - View view = (View) NotationClass1.getTransientChildren().get(i); + for (int i = 0; i < notationClass1.getTransientChildren().size(); i++) { + View view = (View) notationClass1.getTransientChildren().get(i); if (view.getType().equals(StereotypeDisplayConstant.STEREOTYPE_COMPARTMENT_TYPE)) { appliedStereotypeCompartmentNotation = view; } @@ -185,7 +181,7 @@ public class TestStereotypeApplicationQualifiedName extends AbstractPapyrusTestC {// display stereotype1 - RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeToDisplayWithQNCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest, "full"); + RecordingCommand displayStereotypeCommand = StereotypeUserActionHelper.getAddAppliedStereotypeToDisplayWithQNCommand(diagramEditor.getEditingDomain(), notationClass1, stereotypeTest, "full"); diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand); classEditPart.refresh(); org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure) ((BorderedNodeFigure) classEditPart.getFigure()).getChildren().get(0); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/createFromPalette/AbstractCreateNodeFromPaletteTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/createFromPalette/AbstractCreateNodeFromPaletteTest.java index 0b773ecb90d..6c057650841 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/createFromPalette/AbstractCreateNodeFromPaletteTest.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/createFromPalette/AbstractCreateNodeFromPaletteTest.java @@ -207,7 +207,6 @@ public abstract class AbstractCreateNodeFromPaletteTest extends org.eclipse.papy // testSizeCompartment(expectedGraphicalChildren); Element root = (Element) getContainerEditPart().resolveSemanticElement(); - List<Element> ownedElements = root.getOwnedElements(); if (isSemanticTest()) { // assertEquals(CREATION + INITIALIZATION_TEST, expectedSemanticChildren, ownedElements.size()); } diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java index 12711e1575b..d915a736b59 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase.tests/src/org/eclipse/papyrus/uml/diagram/usecase/tests/canonical/TestSpecificTopNode.java @@ -89,6 +89,7 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.uml.diagra * * @return the editing domain (can be null) */ + @Override protected TransactionalEditingDomain getEditingDomain() { ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance(); TransactionalEditingDomain editingDomain = null; @@ -294,7 +295,6 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.uml.diagra * the container type */ public void testToManageTopNode(IElementType type, IElementType containerType) { - int i = 0; testToCreateANode(type); testDestroy(type); diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo(); @@ -312,7 +312,6 @@ public abstract class TestSpecificTopNode extends org.eclipse.papyrus.uml.diagra * the container type */ public void testToManageSpecificTopNode(IElementType type, IElementType containerType, EClass eClassHint) { - int i = 0; testToCreateSpecificNode(type, eClassHint); testDestroy(type); diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo(); diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/sort/AbstractSortTable.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/sort/AbstractSortTable.java index 110aa1f6f8d..a9296de991f 100755 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/sort/AbstractSortTable.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/sort/AbstractSortTable.java @@ -278,6 +278,7 @@ public abstract class AbstractSortTable extends AbstractTableTest { /** * this method initialize some field for the test + expand all the table + check the initial state of the table */ + @Override protected void startTest() { super.startTest(); manager.selectAll(); @@ -345,6 +346,7 @@ public abstract class AbstractSortTable extends AbstractTableTest { /** * @return */ + @Override protected String getSourcePath() { return RESOURCES_PATH; } diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java index 43c709fc828..626fd2af02f 100644 --- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java +++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/TableFillingAndExpandTest.java @@ -54,10 +54,6 @@ public class TableFillingAndExpandTest extends AbstractEditorTest { protected Package packageTest; - private List<?> root; - - private Object diagramTest; - private final String modelName = "tableFillingAndTableExpandTest"; //$NON-NLS-1$ private final String uml_EXT = "uml"; //$NON-NLS-1$ @@ -96,7 +92,6 @@ public class TableFillingAndExpandTest extends AbstractEditorTest { } rootModel = (Model) uml.getContents().get(0); - root = notation.getContents(); // TODO on luna : open diagram } @@ -121,9 +116,6 @@ public class TableFillingAndExpandTest extends AbstractEditorTest { INattableModelManager manager = (INattableModelManager) this.editor.getAdapter(INattableModelManager.class); List<?> elements = manager.getRowElementsList(); Assert.isTrue(elements instanceof TreeList<?>, " the list managing the rows in not a TreeList"); //$NON-NLS-1$ - int size = elements.size(); - int i = 0; - i++; } protected void selectTablePage(int index) { diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/utils/UMLModelCreatorTest.java b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/utils/UMLModelCreatorTest.java index 94210cf475d..49883e9f24c 100644 --- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/utils/UMLModelCreatorTest.java +++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/test/org/eclipse/papyrus/uml/profile/drafter/tests/utils/UMLModelCreatorTest.java @@ -206,12 +206,12 @@ public class UMLModelCreatorTest { public void testCreation() { UMLModelCreator creator = new UMLModelCreator("temp.uml", "model"); // Create model - Package p1 = creator.createPackage("p1"); + creator.createPackage("p1"); creator.createDatatype("dt1"); creator.createDatatype("dt2"); creator.createClass("C1"); creator.cdToRoot(); - Package p2 = creator.createPackage("p2"); + creator.createPackage("p2"); creator.createDatatype("dt21"); creator.createDatatype("dt12"); creator.createClass("C21"); diff --git a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java index 71197e112e0..96a70311ae1 100644 --- a/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java +++ b/tests/junit/plugins/views/org.eclipse.papyrus.views.properties.toolsmiths.tests/src/org/eclipse/papyrus/views/properties/toolsmiths/tests/qvt/TransformationsTests.java @@ -161,11 +161,8 @@ public class TransformationsTests extends AbstractPapyrusTest { // nothing } LinkedList<ModelExtent> result = new LinkedList<ModelExtent>(); - ModelExtent temp = new BasicModelExtent(); ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(ecorePackage)); - - PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot(); ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root)); |