From 2f3f75f387b00ba2eabfce8548802b10012abc11 Mon Sep 17 00:00:00 2001 From: Mickael ADAM Date: Thu, 15 May 2014 15:46:50 +0200 Subject: 432131: [Profile Diagram] Palette should be organized for consistency with other diagrams https://bugs.eclipse.org/bugs/show_bug.cgi?id=432131 Change: -Rebased due to conflict Previous Change: -Replace Generated NOT methode Previous changes: -Use of Zero Blank Formatter Previous changes: - Ordered profile palette - Generation of profile diagram - Removed the ligne of Edit Helper Advice of Class Edit Part CN to avoid NullPointerException at the plugin loading Change-Id: Ibbe5a3a1a8d9ef226359ecf0cdbb1a01654ffad2 Signed-off-by: Mickael ADAM --- .../messages.properties | 225 +- .../model/profilediagram.gmfgen | 4496 +++++++++++++++----- .../plugin.xml | 182 +- .../commands/AssociationBranchCreateCommand.java | 6 +- .../commands/AssociationBranchReorientCommand.java | 6 +- .../edit/commands/AssociationCreateCommand.java | 6 +- .../commands/AssociationNodeCreateCommand.java | 9 +- .../edit/commands/AssociationReorientCommand.java | 6 +- .../edit/commands/ClassOperationCreateCommand.java | 9 +- .../edit/commands/ClassPropertyCreateCommand.java | 9 +- .../CommentAnnotatedElementCreateCommand.java | 6 +- .../CommentAnnotatedElementReorientCommand.java | 6 +- .../edit/commands/CommentCreateCommandCN.java | 9 +- .../commands/CommentEditPartCreateCommand.java | 9 +- .../ConstraintConstrainedElementCreateCommand.java | 6 +- ...onstraintConstrainedElementReorientCommand.java | 6 +- .../edit/commands/ConstraintCreateCommand.java | 9 +- .../edit/commands/ConstraintCreateCommandCN.java | 9 +- .../edit/commands/ContextLinkCreateCommand.java | 6 +- .../edit/commands/ContextLinkReorientCommand.java | 6 +- .../edit/commands/DataTypeCreateCommand.java | 9 +- .../edit/commands/DataTypeCreateCommandCN.java | 9 +- .../commands/DataTypeOperationCreateCommand.java | 9 +- .../commands/DataTypePropertyCreateCommand.java | 9 +- .../commands/DependencyBranchCreateCommand.java | 6 +- .../commands/DependencyBranchReorientCommand.java | 6 +- .../edit/commands/DependencyCreateCommand.java | 6 +- .../edit/commands/DependencyNodeCreateCommand.java | 9 +- .../edit/commands/DependencyReorientCommand.java | 6 +- .../edit/commands/ElementImportCreateCommand.java | 6 +- .../commands/ElementImportReorientCommand.java | 6 +- .../edit/commands/EnumerationCreateCommand.java | 9 +- .../edit/commands/EnumerationCreateCommandCN.java | 9 +- .../commands/EnumerationLiteralCreateCommand.java | 9 +- .../edit/commands/ExtensionCreateCommand.java | 6 +- .../edit/commands/ExtensionReorientCommand.java | 6 +- .../edit/commands/GeneralizationCreateCommand.java | 6 +- .../commands/GeneralizationReorientCommand.java | 6 +- .../edit/commands/MetaclassCreateCommand.java | 9 +- .../edit/commands/MetaclassCreateCommandCN.java | 9 +- .../edit/commands/ModelCreateCommandCN.java | 9 +- .../edit/commands/ModelCreateCommandTN.java | 9 +- .../edit/commands/PackageCreateCommand.java | 9 +- .../edit/commands/PackageCreateCommandCN.java | 9 +- .../edit/commands/PackageImportCreateCommand.java | 6 +- .../commands/PackageImportReorientCommand.java | 6 +- .../edit/commands/PrimitiveTypeCreateCommand.java | 9 +- .../commands/PrimitiveTypeCreateCommandCN.java | 9 +- .../commands/ProfileApplicationCreateCommand.java | 6 +- .../ProfileApplicationReorientCommand.java | 6 +- .../edit/commands/ProfileCreateCommandCN.java | 9 +- .../edit/commands/ProfileCreateCommandTN.java | 9 +- .../commands/ShortCutDiagramCreateCommand.java | 8 +- .../edit/commands/StereotypeCreateCommand.java | 9 +- .../edit/commands/StereotypeCreateCommandCN.java | 9 +- .../edit/helpers/AssociationEditHelper.java | 6 +- .../edit/helpers/ClassOperationEditHelper.java | 6 +- .../edit/helpers/ClassPropertyEditHelper.java | 6 +- .../profile/edit/helpers/CommentEditHelper.java | 6 +- .../profile/edit/helpers/CommentEditHelperCN.java | 6 +- .../profile/edit/helpers/ConstraintEditHelper.java | 6 +- .../edit/helpers/ConstraintEditHelperCN.java | 6 +- .../profile/edit/helpers/DataTypeEditHelper.java | 6 +- .../edit/helpers/DataTypeOperationEditHelper.java | 6 +- .../edit/helpers/DataTypePropertyEditHelper.java | 6 +- .../profile/edit/helpers/DependencyEditHelper.java | 6 +- .../edit/helpers/ElementImportEditHelper.java | 6 +- .../edit/helpers/EnumerationEditHelper.java | 6 +- .../edit/helpers/EnumerationLiteralEditHelper.java | 6 +- .../profile/edit/helpers/ExtensionEditHelper.java | 6 +- .../edit/helpers/GeneralizationEditHelper.java | 6 +- .../profile/edit/helpers/MetaclassEditHelper.java | 6 +- .../profile/edit/helpers/ModelEditHelper.java | 6 +- .../profile/edit/helpers/PackageEditHelper.java | 6 +- .../profile/edit/helpers/PackageEditHelperCN.java | 6 +- .../edit/helpers/PackageImportEditHelper.java | 6 +- .../edit/helpers/PrimitiveTypeEditHelper.java | 6 +- .../edit/helpers/ProfileApplicationEditHelper.java | 6 +- .../edit/helpers/ProfileDiagramEditHelper.java | 6 +- .../profile/edit/helpers/ProfileEditHelper.java | 6 +- .../edit/helpers/ShortCutDiagramEditHelper.java | 6 +- .../profile/edit/helpers/StereotypeEditHelper.java | 6 +- .../profile/edit/helpers/UMLBaseEditHelper.java | 6 +- .../AppliedStereotypeElementImportEditPart.java | 6 +- .../AssociationAppliedStereotypeEditPart.java | 6 +- .../edit/parts/AssociationBranchEditPart.java | 6 +- .../AssociationBranchMultiplicityEditPart.java | 6 +- .../edit/parts/AssociationBranchRoleEditPart.java | 6 +- .../profile/edit/parts/AssociationEditPart.java | 6 +- .../AssociationMultiplicitySourceEditPart.java | 6 +- .../AssociationMultiplicityTargetEditPart.java | 6 +- .../edit/parts/AssociationNameEditPart.java | 6 +- .../edit/parts/AssociationNodeEditPart.java | 25 +- .../edit/parts/AssociationRoleSourceEditPart.java | 6 +- .../edit/parts/AssociationRoleTargetEditPart.java | 6 +- .../diagram/profile/edit/parts/ClassEditPart.java | 5 +- .../profile/edit/parts/ClassEditPartCN.java | 5 +- .../profile/edit/parts/ClassNameEditPart.java | 2 +- .../profile/edit/parts/ClassNameEditPartCN.java | 2 +- .../profile/edit/parts/ClassOperationEditPart.java | 7 +- .../profile/edit/parts/ClassPropertyEditPart.java | 7 +- .../parts/CommentAnnotatedElementEditPart.java | 8 +- .../profile/edit/parts/CommentBodyEditPart.java | 8 +- .../profile/edit/parts/CommentBodyEditPartCN.java | 8 +- .../profile/edit/parts/CommentEditPart.java | 16 +- .../profile/edit/parts/CommentEditPartCN.java | 16 +- .../profile/edit/parts/ConstraintBodyEditPart.java | 6 +- .../edit/parts/ConstraintBodyEditPartCN.java | 6 +- .../ConstraintConstrainedElementEditPart.java | 8 +- .../profile/edit/parts/ConstraintEditPart.java | 16 +- .../profile/edit/parts/ConstraintEditPartCN.java | 16 +- .../profile/edit/parts/ConstraintNameEditPart.java | 6 +- .../edit/parts/ConstraintNameEditPartCN.java | 6 +- .../profile/edit/parts/ContextLinkEditPart.java | 8 +- .../DataTypeAttributeCompartmentEditPart.java | 6 +- .../DataTypeAttributeCompartmentEditPartCN.java | 6 +- .../profile/edit/parts/DataTypeEditPart.java | 16 +- .../profile/edit/parts/DataTypeEditPartCN.java | 18 +- .../profile/edit/parts/DataTypeNameEditPart.java | 8 +- .../profile/edit/parts/DataTypeNameEditPartCN.java | 8 +- .../DataTypeOperationCompartmentEditPart.java | 6 +- .../DataTypeOperationCompartmentEditPartCN.java | 6 +- .../edit/parts/DataTypeOperationEditPart.java | 7 +- .../edit/parts/DataTypePropertyEditPart.java | 7 +- .../parts/DependencyAppliedStereotypeEditPart.java | 6 +- .../edit/parts/DependencyBranchEditPart.java | 6 +- .../profile/edit/parts/DependencyEditPart.java | 6 +- .../profile/edit/parts/DependencyNameEditPart.java | 6 +- .../profile/edit/parts/DependencyNodeEditPart.java | 21 +- .../profile/edit/parts/DiagramNameEditPart.java | 6 +- .../edit/parts/ElementImportAliasEditPart.java | 6 +- .../profile/edit/parts/ElementImportEditPart.java | 6 +- .../profile/edit/parts/EnumerationEditPart.java | 16 +- .../profile/edit/parts/EnumerationEditPartCN.java | 16 +- ...ationEnumerationLiteralCompartmentEditPart.java | 6 +- ...ionEnumerationLiteralCompartmentEditPartCN.java | 6 +- .../edit/parts/EnumerationLiteralEditPart.java | 7 +- .../edit/parts/EnumerationNameEditPart.java | 8 +- .../edit/parts/EnumerationNameEditPartCN.java | 8 +- .../profile/edit/parts/ExtensionEditPart.java | 6 +- .../GeneralizationAppliedStereotypeEditPart.java | 6 +- .../profile/edit/parts/GeneralizationEditPart.java | 6 +- .../profile/edit/parts/MetaclassEditPart.java | 16 +- .../profile/edit/parts/MetaclassEditPartCN.java | 16 +- .../profile/edit/parts/MetaclassNameEditPart.java | 6 +- .../edit/parts/MetaclassNameEditPartCN.java | 6 +- .../profile/edit/parts/ModelEditPartCN.java | 16 +- .../profile/edit/parts/ModelEditPartTN.java | 16 +- .../profile/edit/parts/ModelNameEditPart.java | 8 +- .../profile/edit/parts/ModelNameEditPartCN.java | 8 +- ...delPackageableElementCompartmentEditPartCN.java | 6 +- ...delPackageableElementCompartmentEditPartTN.java | 6 +- .../edit/parts/MultiDependencyLabelEditPart.java | 6 +- .../profile/edit/parts/PackageEditPart.java | 16 +- .../profile/edit/parts/PackageEditPartCN.java | 16 +- .../PackageImportAppliedStereotypeEditPart.java | 6 +- .../profile/edit/parts/PackageImportEditPart.java | 6 +- .../profile/edit/parts/PackageNameEditPart.java | 8 +- .../profile/edit/parts/PackageNameEditPartCN.java | 8 +- ...ckagePackageableElementCompartmentEditPart.java | 6 +- ...agePackageableElementCompartmentEditPartCN.java | 6 +- .../profile/edit/parts/PrimitiveTypeEditPart.java | 16 +- .../edit/parts/PrimitiveTypeEditPartCN.java | 16 +- .../edit/parts/PrimitiveTypeNameEditPart.java | 9 +- .../edit/parts/PrimitiveTypeNameEditPartCN.java | 9 +- .../edit/parts/ProfileApplicationEditPart.java | 6 +- .../profile/edit/parts/ProfileDiagramEditPart.java | 6 +- .../profile/edit/parts/ProfileEditPartCN.java | 16 +- .../profile/edit/parts/ProfileEditPartTN.java | 16 +- .../profile/edit/parts/ProfileNameEditPartCN.java | 8 +- .../profile/edit/parts/ProfileNameEditPartTN.java | 8 +- ...ilePackageableElementCompartmentEditPartCN.java | 6 +- ...ilePackageableElementCompartmentEditPartTN.java | 6 +- .../edit/parts/ShortCutDiagramEditPart.java | 16 +- .../StereotypeAttributeCompartmentEditPart.java | 6 +- .../StereotypeAttributeCompartmentEditPartCN.java | 6 +- .../profile/edit/parts/StereotypeEditPart.java | 16 +- .../profile/edit/parts/StereotypeEditPartCN.java | 16 +- .../profile/edit/parts/StereotypeNameEditPart.java | 8 +- .../edit/parts/StereotypeNameEditPartCN.java | 8 +- .../StereotypeOperationCompartmentEditPart.java | 6 +- .../StereotypeOperationCompartmentEditPartCN.java | 6 +- .../profile/edit/parts/UMLEditPartFactory.java | 6 +- .../AssociationBranchItemSemanticEditPolicy.java | 6 +- .../AssociationItemSemanticEditPolicy.java | 6 +- .../AssociationNodeItemSemanticEditPolicy.java | 6 +- .../ClassOperationItemSemanticEditPolicy.java | 6 +- .../ClassPropertyItemSemanticEditPolicy.java | 6 +- ...mentAnnotatedElementItemSemanticEditPolicy.java | 6 +- .../CommentEditPartItemSemanticEditPolicy.java | 6 +- .../policies/CommentItemSemanticEditPolicyCN.java | 6 +- ...ntConstrainedElementItemSemanticEditPolicy.java | 6 +- .../policies/ConstraintItemSemanticEditPolicy.java | 6 +- .../ConstraintItemSemanticEditPolicyCN.java | 6 +- .../ContextLinkItemSemanticEditPolicy.java | 6 +- ...AttributeCompartmentItemSemanticEditPolicy.java | 8 +- ...tributeCompartmentItemSemanticEditPolicyCN.java | 8 +- .../policies/DataTypeItemSemanticEditPolicy.java | 6 +- .../policies/DataTypeItemSemanticEditPolicyCN.java | 6 +- ...OperationCompartmentItemSemanticEditPolicy.java | 8 +- ...erationCompartmentItemSemanticEditPolicyCN.java | 8 +- .../DataTypeOperationItemSemanticEditPolicy.java | 6 +- .../DataTypePropertyItemSemanticEditPolicy.java | 6 +- .../DependencyBranchItemSemanticEditPolicy.java | 6 +- .../policies/DependencyItemSemanticEditPolicy.java | 6 +- .../DependencyNodeItemSemanticEditPolicy.java | 6 +- .../ElementImportItemSemanticEditPolicy.java | 6 +- ...onLiteralCompartmentItemSemanticEditPolicy.java | 8 +- ...LiteralCompartmentItemSemanticEditPolicyCN.java | 8 +- .../EnumerationItemSemanticEditPolicy.java | 6 +- .../EnumerationItemSemanticEditPolicyCN.java | 6 +- .../EnumerationLiteralItemSemanticEditPolicy.java | 6 +- .../policies/ExtensionItemSemanticEditPolicy.java | 6 +- .../GeneralizationItemSemanticEditPolicy.java | 6 +- .../policies/MetaclassItemSemanticEditPolicy.java | 6 +- .../MetaclassItemSemanticEditPolicyCN.java | 6 +- .../policies/ModelItemSemanticEditPolicyCN.java | 6 +- .../policies/ModelItemSemanticEditPolicyTN.java | 6 +- ...ElementCompartmentItemSemanticEditPolicyCN.java | 8 +- ...ElementCompartmentItemSemanticEditPolicyTN.java | 8 +- .../PackageImportItemSemanticEditPolicy.java | 6 +- .../policies/PackageItemSemanticEditPolicy.java | 6 +- .../policies/PackageItemSemanticEditPolicyCN.java | 6 +- ...leElementCompartmentItemSemanticEditPolicy.java | 8 +- ...ElementCompartmentItemSemanticEditPolicyCN.java | 8 +- .../PrimitiveTypeItemSemanticEditPolicy.java | 6 +- .../PrimitiveTypeItemSemanticEditPolicyCN.java | 6 +- .../ProfileApplicationItemSemanticEditPolicy.java | 6 +- .../ProfileDiagramItemSemanticEditPolicy.java | 8 +- .../policies/ProfileItemSemanticEditPolicyCN.java | 6 +- .../policies/ProfileItemSemanticEditPolicyTN.java | 6 +- ...ElementCompartmentItemSemanticEditPolicyCN.java | 8 +- ...ElementCompartmentItemSemanticEditPolicyTN.java | 8 +- .../ShortCutDiagramItemSemanticEditPolicy.java | 6 +- ...AttributeCompartmentItemSemanticEditPolicy.java | 8 +- ...tributeCompartmentItemSemanticEditPolicyCN.java | 8 +- .../policies/StereotypeItemSemanticEditPolicy.java | 6 +- .../StereotypeItemSemanticEditPolicyCN.java | 6 +- ...OperationCompartmentItemSemanticEditPolicy.java | 8 +- ...erationCompartmentItemSemanticEditPolicyCN.java | 8 +- .../policies/UMLBaseItemSemanticEditPolicy.java | 6 +- .../policies/UMLTextNonResizableEditPolicy.java | 6 +- .../edit/policies/UMLTextSelectionEditPolicy.java | 6 +- .../navigator/UMLAbstractNavigatorItem.java | 6 +- .../UMLDomainNavigatorContentProvider.java | 6 +- .../profile/navigator/UMLDomainNavigatorItem.java | 6 +- .../navigator/UMLDomainNavigatorLabelProvider.java | 6 +- .../navigator/UMLNavigatorActionProvider.java | 6 +- .../navigator/UMLNavigatorContentProvider.java | 6 +- .../profile/navigator/UMLNavigatorGroup.java | 6 +- .../profile/navigator/UMLNavigatorItem.java | 6 +- .../navigator/UMLNavigatorLabelProvider.java | 6 +- .../profile/navigator/UMLNavigatorLinkHelper.java | 8 +- .../profile/navigator/UMLNavigatorSorter.java | 6 +- .../profile/parsers/MessageFormatParser.java | 6 +- .../part/DiagramEditorContextMenuProvider.java | 6 +- .../diagram/profile/part/LoadResourceAction.java | 6 +- .../papyrus/uml/diagram/profile/part/Messages.java | 78 +- .../profile/part/ModelElementSelectionPage.java | 6 +- .../diagram/profile/part/UMLCreationWizard.java | 6 +- .../profile/part/UMLCreationWizardPage.java | 6 +- .../part/UMLDiagramActionBarContributor.java | 6 +- .../profile/part/UMLDiagramContentInitializer.java | 128 +- .../uml/diagram/profile/part/UMLDiagramEditor.java | 7 +- .../profile/part/UMLDiagramEditorPlugin.java | 49 +- .../diagram/profile/part/UMLDiagramEditorUtil.java | 6 +- .../profile/part/UMLDiagramUpdateCommand.java | 6 +- .../diagram/profile/part/UMLDiagramUpdater.java | 404 +- .../diagram/profile/part/UMLDocumentProvider.java | 6 +- .../profile/part/UMLInitDiagramFileAction.java | 6 +- .../diagram/profile/part/UMLLinkDescriptor.java | 6 +- .../diagram/profile/part/UMLMatchingStrategy.java | 6 +- .../profile/part/UMLNewDiagramFileWizard.java | 6 +- .../diagram/profile/part/UMLNodeDescriptor.java | 6 +- .../diagram/profile/part/UMLPaletteFactory.java | 218 +- .../profile/part/UMLUriEditorInputTester.java | 6 +- .../diagram/profile/part/UMLVisualIDRegistry.java | 19 +- .../uml/diagram/profile/part/ValidateAction.java | 6 +- .../DiagramAppearancePreferencePage.java | 6 +- .../DiagramConnectionsPreferencePage.java | 6 +- .../preferences/DiagramGeneralPreferencePage.java | 6 +- .../preferences/DiagramPreferenceInitializer.java | 6 +- .../preferences/DiagramPrintingPreferencePage.java | 6 +- .../DiagramRulersAndGridPreferencePage.java | 6 +- .../profile/providers/ElementInitializers.java | 6 +- .../profile/providers/UMLEditPartProvider.java | 6 +- .../diagram/profile/providers/UMLElementTypes.java | 6 +- .../diagram/profile/providers/UMLIconProvider.java | 6 +- .../providers/UMLMarkerNavigationProvider.java | 6 +- .../profile/providers/UMLParserProvider.java | 6 +- .../providers/UMLValidationDecoratorProvider.java | 6 +- .../profile/providers/UMLValidationProvider.java | 6 +- .../diagram/profile/providers/UMLViewProvider.java | 108 +- .../diagram/profile/sheet/UMLPropertySection.java | 6 +- .../profile/sheet/UMLSheetLabelProvider.java | 6 +- 295 files changed, 4826 insertions(+), 3192 deletions(-) diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties index 2d467511ac9..fe493d68f98 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/messages.properties @@ -1,112 +1,113 @@ - -UMLCreationWizardTitle=New PapyrusUMLProfileDiagram Diagram -UMLCreationWizard_DiagramModelFilePageTitle=Create PapyrusUMLProfileDiagram Diagram -UMLCreationWizard_DiagramModelFilePageDescription=Select file that will contain diagram model. -UMLCreationWizard_DomainModelFilePageTitle=Create PapyrusUMLProfileDiagram Domain Model -UMLCreationWizard_DomainModelFilePageDescription=Select file that will contain domain model. -UMLCreationWizardOpenEditorError=Error opening diagram editor -UMLCreationWizardCreationError=Creation Problems -UMLCreationWizardPageExtensionError=File name should have {0} extension. -UMLDiagramEditorUtil_OpenModelResourceErrorDialogTitle=Error -UMLDiagramEditorUtil_OpenModelResourceErrorDialogMessage=Failed to load model file {0} -UMLDiagramEditorUtil_CreateDiagramProgressTask=Creating diagram and model files -UMLDiagramEditorUtil_CreateDiagramCommandLabel=Creating diagram and model -UMLDocumentProvider_isModifiable=Updating cache failed -UMLDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource -UMLDocumentProvider_IncorrectInputError={1} -UMLDocumentProvider_NoDiagramInResourceError=Diagram is not present in resource -UMLDocumentProvider_DiagramLoadingError=Error loading diagram -UMLDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system -UMLDocumentProvider_SaveDiagramTask=Saving diagram -UMLDocumentProvider_SaveNextResourceTask=Saving {0} -UMLDocumentProvider_SaveAsOperation=Saving {0} diagram as -InitDiagramFile_ResourceErrorDialogTitle=Error -InitDiagramFile_ResourceErrorDialogMessage=Model file loading failed -InitDiagramFile_WizardTitle=Initialize new {0} diagram file -InitDiagramFile_OpenModelFileDialogTitle=Select domain model -UMLNewDiagramFileWizard_CreationPageName=Initialize new diagram file -UMLNewDiagramFileWizard_CreationPageTitle=Diagram file -UMLNewDiagramFileWizard_CreationPageDescription=Create new diagram based on {0} model content -UMLNewDiagramFileWizard_RootSelectionPageName=Select diagram root element -UMLNewDiagramFileWizard_RootSelectionPageTitle=Diagram root element -UMLNewDiagramFileWizard_RootSelectionPageDescription=Select semantic model element to be depicted on diagram -UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle=Select diagram root element: -UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage=Diagram root element is not selected -UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage=Invalid diagram root element is selected -UMLNewDiagramFileWizard_InitDiagramCommand=Initializing diagram contents -UMLNewDiagramFileWizard_IncorrectRootError=Incorrect model object stored as a root resource object -UMLDiagramEditor_SavingDeletedFile=The original file "{0}" has been deleted. -UMLDiagramEditor_SaveAsErrorTitle=Problem During Save As... -UMLDiagramEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor. -UMLDiagramEditor_SaveErrorTitle=Save Problems -UMLDiagramEditor_SaveErrorMessage=Could not save file. -UMLElementChooserDialog_SelectModelElementTitle=Select model element -ModelElementSelectionPageMessage=Select model element: -ValidateActionMessage=Validate -PackagePackageableElementCompartmentEditPart_title=packaged elements -PackagePackageableElementCompartmentEditPartCN_title=packaged elements -ProfilePackageableElementCompartmentEditPartTN_title=packaged elements -ProfilePackageableElementCompartmentEditPartCN_title=packaged elements -StereotypeAttributeCompartmentEditPart_title=attributes -StereotypeAttributeCompartmentEditPartCN_title=attributes -StereotypeOperationCompartmentEditPart_title=operations -StereotypeOperationCompartmentEditPartCN_title=operations -ModelPackageableElementCompartmentEditPartTN_title=packaged elements -ModelPackageableElementCompartmentEditPartCN_title=packaged elements -EnumerationEnumerationLiteralCompartmentEditPartCN_title=literals -EnumerationEnumerationLiteralCompartmentEditPart_title=literals -DataTypeAttributeCompartmentEditPart_title=attributes -DataTypeAttributeCompartmentEditPartCN_title=attributes -DataTypeOperationCompartmentEditPart_title=operations -DataTypeOperationCompartmentEditPartCN_title=operations -CommandName_OpenDiagram=Open Diagram -NavigatorActionProvider_OpenDiagramActionName=Open Diagram -MessageFormatParser_InvalidInputError=Invalid input at {0} -UMLModelingAssistantProviderTitle=Select domain model element -UMLModelingAssistantProviderMessage=Available domain model elements: -Package1CreationTool_title=Package -Package1CreationTool_desc=Create a new Package -Profile2CreationTool_title=Profile -Profile2CreationTool_desc=Add a new Profile -Comment3CreationTool_title=Comment -Comment3CreationTool_desc=Create new comment -Constraint4CreationTool_title=Constraint -Constraint4CreationTool_desc=Create a constraint -Extension1CreationTool_title=Extension -Extension1CreationTool_desc=Add an Extension -Generalization2CreationTool_title=Generalization -Generalization2CreationTool_desc=Create a generalization -Link3CreationTool_title=Link -Link3CreationTool_desc=Create a link for Comment, Constraint -ProfileApplication4CreationTool_title=ProfileApplication -ProfileApplication4CreationTool_desc=Create a ProfileApplication -Association5CreationTool_title=Association -Association5CreationTool_desc=Create an Association -ContextLink6CreationTool_title=ContextLink -ContextLink6CreationTool_desc=Creation of a context link for a Constraint -Nodes1Group_title=Nodes -Nodes1Group_desc=Nodes -Edges2Group_title=Edges -Edges2Group_desc=Edges -Stereotype5CreationTool_title=Stereotype -Stereotype5CreationTool_desc=Add new Stereotype -Class6CreationTool_title=Class -Class6CreationTool_desc=Create a new Class -ImportMetaclass7CreationTool_title=Import Metaclass -ImportMetaclass7CreationTool_desc=Import a new Metaclass -Enumeration8CreationTool_title=Enumeration -Enumeration8CreationTool_desc=Create new Enumeration -DataType9CreationTool_title=DataType -DataType9CreationTool_desc=Create new DataType -PrimitiveType10CreationTool_title=PrimitiveType -PrimitiveType10CreationTool_desc=Create new PrimitiveType -Property11CreationTool_title=Property -Property11CreationTool_desc=Add new property -Operation12CreationTool_title=Operation -Operation12CreationTool_desc=Add new operation -EnumerationLiteral13CreationTool_title=EnumerationLiteral -EnumerationLiteral13CreationTool_desc=Add new EnumerationLiteral -ClassAttributeCompartmentEditPart_title=attributes -ClassAttributeCompartmentEditPartCN_title=attributes -ClassOperationCompartmentEditPart_title=operations -ClassOperationCompartmentEditPartCN_title=operations + +# TODO: manually put keys and values +UMLCreationWizardTitle=New PapyrusUMLProfileDiagram Diagram +UMLCreationWizard_DiagramModelFilePageTitle=Create PapyrusUMLProfileDiagram Diagram +UMLCreationWizard_DiagramModelFilePageDescription=Select file that will contain diagram model. +UMLCreationWizard_DomainModelFilePageTitle=Create PapyrusUMLProfileDiagram Domain Model +UMLCreationWizard_DomainModelFilePageDescription=Select file that will contain domain model. +UMLCreationWizardOpenEditorError=Error opening diagram editor +UMLCreationWizardCreationError=Creation Problems +UMLCreationWizardPageExtensionError=File name should have {0} extension. +UMLDiagramEditorUtil_OpenModelResourceErrorDialogTitle=Error +UMLDiagramEditorUtil_OpenModelResourceErrorDialogMessage=Failed to load model file {0} +UMLDiagramEditorUtil_CreateDiagramProgressTask=Creating diagram and model files +UMLDiagramEditorUtil_CreateDiagramCommandLabel=Creating diagram and model +UMLDocumentProvider_isModifiable=Updating cache failed +UMLDocumentProvider_handleElementContentChanged=Failed to refresh hierarchy for changed resource +UMLDocumentProvider_IncorrectInputError=Incorrect element used: {0} instead of {1} or {2} +UMLDocumentProvider_NoDiagramInResourceError=Diagram is not present in resource +UMLDocumentProvider_DiagramLoadingError=Error loading diagram +UMLDocumentProvider_UnsynchronizedFileSaveError=The file has been changed on the file system +UMLDocumentProvider_SaveDiagramTask=Saving diagram +UMLDocumentProvider_SaveNextResourceTask=Saving {0} +UMLDocumentProvider_SaveAsOperation=Saving {0} diagram as +InitDiagramFile_ResourceErrorDialogTitle=Error +InitDiagramFile_ResourceErrorDialogMessage=Model file loading failed +InitDiagramFile_WizardTitle=Initialize new {0} diagram file +InitDiagramFile_OpenModelFileDialogTitle=Select domain model +UMLNewDiagramFileWizard_CreationPageName=Initialize new diagram file +UMLNewDiagramFileWizard_CreationPageTitle=Diagram file +UMLNewDiagramFileWizard_CreationPageDescription=Create new diagram based on {0} model content +UMLNewDiagramFileWizard_RootSelectionPageName=Select diagram root element +UMLNewDiagramFileWizard_RootSelectionPageTitle=Diagram root element +UMLNewDiagramFileWizard_RootSelectionPageDescription=Select semantic model element to be depicted on diagram +UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle=Select diagram root element: +UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage=Diagram root element is not selected +UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage=Invalid diagram root element is selected +UMLNewDiagramFileWizard_InitDiagramCommand=Initializing diagram contents +UMLNewDiagramFileWizard_IncorrectRootError=Incorrect model object stored as a root resource object +UMLDiagramEditor_SavingDeletedFile=The original file "{0}" has been deleted. +UMLDiagramEditor_SaveAsErrorTitle=Problem During Save As... +UMLDiagramEditor_SaveAsErrorMessage=Save could not be completed. Target file is already open in another editor. +UMLDiagramEditor_SaveErrorTitle=Save Problems +UMLDiagramEditor_SaveErrorMessage=Could not save file. +UMLElementChooserDialog_SelectModelElementTitle=Select model element +ModelElementSelectionPageMessage=Select model element: +ValidateActionMessage=Validate +Nodes1Group_title=Nodes +Nodes1Group_desc=Nodes +Edges2Group_title=Edges +Edges2Group_desc=Edges +Class6CreationTool_title=Class +Class6CreationTool_desc=Create a new Class +Comment2CreationTool_title=Comment +Comment2CreationTool_desc=Create new comment +Constraint3CreationTool_title=Constraint +Constraint3CreationTool_desc=Create a constraint +DataType4CreationTool_title=DataType +DataType4CreationTool_desc=Create new DataType +Enumeration5CreationTool_title=Enumeration +Enumeration5CreationTool_desc=Create new Enumeration +EnumerationLiteral6CreationTool_title=EnumerationLiteral +EnumerationLiteral6CreationTool_desc=Add new EnumerationLiteral +ImportMetaclass7CreationTool_title=Import Metaclass +ImportMetaclass7CreationTool_desc=Import a new Metaclass +Operation8CreationTool_title=Operation +Operation8CreationTool_desc=Add new operation +Package9CreationTool_title=Package +Package9CreationTool_desc=Create a new Package +Profile10CreationTool_title=Profile +Profile10CreationTool_desc=Add a new Profile +PrimitiveType11CreationTool_title=PrimitiveType +PrimitiveType11CreationTool_desc=Create new PrimitiveType +Property12CreationTool_title=Property +Property12CreationTool_desc=Add new property +Stereotype13CreationTool_title=Stereotype +Stereotype13CreationTool_desc=Add new Stereotype +Association1CreationTool_title=Association +Association1CreationTool_desc=Create an Association +ContextLink6CreationTool_title=ContextLink +ContextLink6CreationTool_desc=Creation of a context link for a Constraint +Extension3CreationTool_title=Extension +Extension3CreationTool_desc=Add an Extension +Generalization4CreationTool_title=Generalization +Generalization4CreationTool_desc=Create a generalization +Link5CreationTool_title=Link +Link5CreationTool_desc=Create a link for Comment, Constraint +ProfileApplication6CreationTool_title=ProfileApplication +ProfileApplication6CreationTool_desc=Create a ProfileApplication +PackagePackageableElementCompartmentEditPart_title=packaged elements +PackagePackageableElementCompartmentEditPartCN_title=packaged elements +ProfilePackageableElementCompartmentEditPartTN_title=packaged elements +ProfilePackageableElementCompartmentEditPartCN_title=packaged elements +StereotypeAttributeCompartmentEditPart_title=attributes +StereotypeAttributeCompartmentEditPartCN_title=attributes +StereotypeOperationCompartmentEditPart_title=operations +StereotypeOperationCompartmentEditPartCN_title=operations +ModelPackageableElementCompartmentEditPartTN_title=packaged elements +ModelPackageableElementCompartmentEditPartCN_title=packaged elements +EnumerationEnumerationLiteralCompartmentEditPartCN_title=literals +EnumerationEnumerationLiteralCompartmentEditPart_title=literals +DataTypeAttributeCompartmentEditPart_title=attributes +DataTypeAttributeCompartmentEditPartCN_title=attributes +DataTypeOperationCompartmentEditPart_title=operations +DataTypeOperationCompartmentEditPartCN_title=operations +ClassAttributeCompartmentEditPart_title=attributes +ClassAttributeCompartmentEditPartCN_title=attributes +ClassOperationCompartmentEditPart_title=operations +ClassOperationCompartmentEditPartCN_title=operations +CommandName_OpenDiagram=Open Diagram +NavigatorActionProvider_OpenDiagramActionName=Open Diagram +MessageFormatParser_InvalidInputError=Invalid input at {0} +UMLModelingAssistantProviderTitle=Select domain model element +UMLModelingAssistantProviderMessage=Available domain model elements: diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen index e29ebfd1c3f..301c4ecc58b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen @@ -1,1304 +1,3548 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - + + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - + + + - + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - + + - + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + org.eclipse.draw2d org.eclipse.gmf.runtime.draw2d.ui @@ -1306,77 +3550,259 @@ - - - - + + + + org.eclipse.gmf.runtime.notation.View org.eclipse.gef.EditPart abstractNavigatorItem - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml index 7d166dbbcc8..d64b976160b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml @@ -45,28 +45,18 @@ - - + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"> + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"> + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"> + + + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"> + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"> + + + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif"> + small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"> + + - - - - @@ -267,27 +267,27 @@ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java index 63522499bd9..044d7083966 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java index 983ad4bac0f..212c47382e0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationBranchReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java index a91aec08bee..92baab1819d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java index 67f430bc989..08ae9022c79 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationNodeCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -37,6 +35,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class AssociationNodeCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java index 79b533f3947..2876729b2c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/AssociationReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java index cfb643982fa..bb72b7e8de5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassOperationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ClassOperationCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java index 0e72f51c66e..b0098d950fa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ClassPropertyCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ClassPropertyCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java index bc3ac0a0b3d..ca50b67bbb5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java index 0bef382f5be..ce62a43cad5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentAnnotatedElementReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java index 5ca750477e6..8afa35db79a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class CommentCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java index 593ff38f1ca..31d1bd425d9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/CommentEditPartCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class CommentEditPartCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java index 33071ee2341..d79b7b3ffb7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java index de3b4f5751c..9d07c46886f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintConstrainedElementReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java index 101d2f2f981..955c132eb50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ConstraintCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java index 04bfe228107..e7421631301 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ConstraintCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ConstraintCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkCreateCommand.java index 8c7240ea8ab..082265acc2d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkReorientCommand.java index 933bf7f797b..bf8844d8660 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ContextLinkReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java index 043fc1ad697..6b84f15f23e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class DataTypeCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java index 1d205fd190c..678d1de80da 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class DataTypeCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java index 5c7b65deb8a..69fefc2db83 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypeOperationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class DataTypeOperationCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java index 8dc32e87276..036df4a463d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DataTypePropertyCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class DataTypePropertyCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java index 6becd0049d1..6c4566aa754 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java index b9c2b9bab5d..adeea3ae4d6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyBranchReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java index 4d0a46b8329..c42b141f3ad 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java index 6e47d944af6..af0a0c6761f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyNodeCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -37,6 +35,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class DependencyNodeCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java index 759acf7e8ce..529d1e623d7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/DependencyReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java index f531a696af7..07be9212a6e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java index 3391c151c87..25315f3178b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ElementImportReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java index ccb341040d1..965c5e19be5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class EnumerationCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java index f9a2d9397d2..b71e9bf3849 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class EnumerationCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java index 90a36c78006..f34efb034a0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/EnumerationLiteralCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class EnumerationLiteralCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java index 61bcf8f5407..3a8a567f353 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java index 6afa56daa6a..7da21244f82 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ExtensionReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java index bb95c473e55..5e674ae150a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java index ef654b509b9..d3791eb46c2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/GeneralizationReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java index e698793eb37..185494b89c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class MetaclassCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java index 471c2834f65..baa7530ca88 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/MetaclassCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class MetaclassCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java index 337158936fe..8aaa5fe67e8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ModelCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java index 30d7893401c..99a242e2e25 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ModelCreateCommandTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ModelCreateCommandTN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java index a1b13c36b9a..7dca5b5f105 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -37,6 +35,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class PackageCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java index b4ab8bcadc3..83f678ee2c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -37,6 +35,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class PackageCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java index 8755f84dd5f..814c1769a5b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java index fa49e082d3d..0f72083052b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PackageImportReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java index 5c7da76fde8..05351721a22 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class PrimitiveTypeCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java index b3b6eb13e7a..fab38f22573 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/PrimitiveTypeCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class PrimitiveTypeCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java index 084a930496c..9e4bec5504b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java index 708ab857f20..d18237a1f1a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileApplicationReorientCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java index 26cd4d76830..7e6676e35f2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ProfileCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java index e06a3852537..014a6e34af1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ProfileCreateCommandTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class ProfileCreateCommandTN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java index efeb85148ba..501ad103c38 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/ShortCutDiagramCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -33,8 +31,6 @@ import org.eclipse.gmf.runtime.notation.View; */ public class ShortCutDiagramCreateCommand extends EditElementCommand { - private Diagram diagram = null; - /** * @generated */ diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java index d3d00a90c91..76b3e8dd4da 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class StereotypeCreateCommand extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java index 5452526d7a7..f616b16a841 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/commands/StereotypeCreateCommandCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.commands; @@ -38,6 +36,9 @@ import org.eclipse.uml2.uml.UMLPackage; */ public class StereotypeCreateCommandCN extends EditElementCommand { + /** + * @generated + */ private Diagram diagram = null; /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java index 93984de6e6c..c17601561ec 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/AssociationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java index 5104cf4fb48..8095f8eb706 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassOperationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java index 6a63a8b502d..15b4359cf1a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ClassPropertyEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java index 57d19b17fe8..ce261d2a865 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java index e3fdb31a213..c8949e3c4dc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/CommentEditHelperCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java index 9c9e09fdbcb..3901567c281 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java index d7ae465b9cb..bbe5533f029 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ConstraintEditHelperCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java index 43bf12b3a90..f6251f75ccd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java index 3fe595786be..a65a4a2966a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypeOperationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java index f9ad3f949d2..999e63d5aa7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DataTypePropertyEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java index 543e5730a7e..891eb53462f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/DependencyEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java index 2b83a5936cd..ee7f769ab80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ElementImportEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java index 57e00111d34..db3b40cfcef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java index 25725350d4c..c981f223835 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/EnumerationLiteralEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java index 82776d5942d..a66636b74a6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ExtensionEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java index fdbbddbc5d3..3ff2577c056 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/GeneralizationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java index 47923c4cf5f..930adf30da3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/MetaclassEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java index c833eb73bce..14ddc233de6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ModelEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java index fb714ab71ae..d069aed95aa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java index 627051c55b2..2682c06d83f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageEditHelperCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java index 953c7c95b87..1259199e36d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PackageImportEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java index bd6dc1c7890..5ba28249d7a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/PrimitiveTypeEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java index 67c8f06c216..0fb38dedee1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileApplicationEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java index 2e0a86b19e2..fc84c7111ac 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileDiagramEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java index 1cfc27a6272..b212f8fae32 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ProfileEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java index 00d9cd5a15e..9601d601199 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/ShortCutDiagramEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java index 1e91af01ed0..e102e0ccbfc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/StereotypeEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java index 6a563bf9b73..95768d8008e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/helpers/UMLBaseEditHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.helpers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java index 9bf8ddaaf2e..8f28b46c48a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AppliedStereotypeElementImportEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java index 5f47e777e6c..df970393e20 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationAppliedStereotypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java index 6547f6bd710..1b457c76138 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java index 7127e3ba179..fb5eda960e7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchMultiplicityEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java index 632121c0b3d..0e17ccb89e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationBranchRoleEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java index 75df4180077..74e5c0ee461 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java index 74600483f2a..bce7d3a3d1b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicitySourceEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java index 71c5996ec66..cbdcd4d9127 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationMultiplicityTargetEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java index 6248d9388ed..3ca28cdd9f8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java index 2c73d8f0063..c0cf15bd491 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,20 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Shape; -import org.eclipse.draw2d.StackLayout; -import org.eclipse.draw2d.geometry.Point; -import org.eclipse.draw2d.geometry.PointList; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; @@ -28,21 +19,17 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.LayoutEditPolicy; import org.eclipse.gef.editpolicies.NonResizableEditPolicy; import org.eclipse.gef.requests.CreateRequest; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.figure.node.DiamondNode; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.AssociationNodeItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.swt.graphics.Color; /** @@ -118,7 +105,7 @@ public class AssociationNodeEditPart extends NodeEditPart { } /** - * AssociationNodeDescriptor + * org.eclipse.papyrus.uml.diagram.common.figure.node.DiamondNode * @generated */ public DiamondNode getPrimaryShape() { @@ -185,8 +172,8 @@ public class AssociationNodeEditPart extends NodeEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java index 85900b89955..a1ce277ab17 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleSourceEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java index bbff6f0fe79..07853080129 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationRoleTargetEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPart.java index f6128f53351..da1044511ae 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPart.java @@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -270,8 +271,8 @@ public class ClassEditPart extends NodeEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPartCN.java index f4bdaf9dc9f..3e092744315 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassEditPartCN.java @@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy; @@ -267,8 +268,8 @@ public class ClassEditPartCN extends NodeEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPart.java index 0f798ca3168..25133e3e5c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPart.java @@ -605,7 +605,7 @@ public class ClassNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPartCN.java index 70bac9b29b8..4d85fd88812 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassNameEditPartCN.java @@ -591,7 +591,7 @@ public class ClassNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java index 8218001024a..8e4cdcd1c46 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassOperationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -84,7 +82,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java index 77d4b64c211..60ccba2ae42 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ClassPropertyEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -84,7 +82,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java index 92b702c1f22..393759d1001 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentAnnotatedElementEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,18 +7,14 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.Connection; -import org.eclipse.draw2d.Graphics; import org.eclipse.gef.EditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; -import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart; import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java index d4fc9ec4d3f..5c25da86bb7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements I * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java index cc9c005577a..51a2c4df34c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentBodyEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java index 55f23a99127..a3083850c9c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,17 +26,14 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.CommentEditPartItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -244,8 +238,8 @@ public class CommentEditPart extends AbstractCommentEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java index 1d71972a5a0..94a924d4d61 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,17 +26,14 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.CommentItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -244,8 +238,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java index 78689f10c86..b0e497b90b1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPartCN.java index 0b27a18e796..47fdc86fc4d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintBodyEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java index d2d7d03dc5c..66772b2b107 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintConstrainedElementEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,18 +7,14 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.Connection; -import org.eclipse.draw2d.Graphics; import org.eclipse.gef.EditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; -import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart; import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java index b63d587d3ff..c7d36d3b37a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,17 +26,14 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -252,8 +246,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java index d25ac1cfcbb..30698acff88 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,15 +26,12 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart; import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ConstraintItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -248,8 +242,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java index 5779525cec9..0d0c31738ac 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java index c8aed569898..6a21e57d418 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkEditPart.java index 489455d5a93..08bdcd8c1ea 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ContextLinkEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,18 +7,14 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.Connection; -import org.eclipse.draw2d.Graphics; import org.eclipse.gef.EditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; -import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart; import org.eclipse.papyrus.uml.diagram.profile.custom.figure.CustomContextLinkFigure; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java index 7880ccdf1fa..f43df0d5507 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java index f125d8872c0..a104cfddaba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeAttributeCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java index ba324022156..08c634b4ff3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -32,9 +29,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -43,11 +39,9 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPo import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -286,8 +280,8 @@ public class DataTypeEditPart extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java index 6748687b521..0e292ad08c1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -32,22 +29,17 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; -import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomDataTypeItemSemanticEditPolicyCN; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DataTypeItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -285,8 +277,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java index ce6e3e3f9fe..21769dd9126 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java index 7d8ee346023..b6ead8e790f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implement * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java index ff46c867609..644085b3ff4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java index 8de44cfdccc..350590b77dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java index 61dc5a37713..b231eabf3f4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeOperationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -84,7 +82,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java index 594880a076b..6cd272fa197 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypePropertyEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -84,7 +82,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java index 8314df2f160..fc13e2575c5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyAppliedStereotypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java index 2eeaa5b7c39..dc33059fc99 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyBranchEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java index fb9a04c6116..5c34783c9e2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java index cc1d188c683..9534976dad8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java index 8ca1b1b99f9..5a2ab30eae8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,20 +7,15 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import java.util.Collections; import java.util.List; -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Ellipse; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.StackLayout; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -31,7 +26,6 @@ import org.eclipse.gef.editpolicies.LayoutEditPolicy; import org.eclipse.gef.editpolicies.NonResizableEditPolicy; import org.eclipse.gef.handles.MoveHandle; import org.eclipse.gef.requests.CreateRequest; -import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles; @@ -39,15 +33,12 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyNodeItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -135,7 +126,7 @@ public class DependencyNodeEditPart extends NodeEditPart { } /** - * DependencyNodeDescriptor + * org.eclipse.papyrus.uml.diagram.common.figure.node.DependencyNodeFigure * @generated */ public DependencyNodeFigure getPrimaryShape() { @@ -215,8 +206,8 @@ public class DependencyNodeEditPart extends NodeEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java index 3379f1feb65..a5e06499388 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DiagramNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java index cc228fa2b65..b364574b1f7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportAliasEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java index d767be60971..333471f4968 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ElementImportEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java index 013b2adfa96..f5afd04d9c0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -32,9 +29,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -43,11 +39,9 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPo import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -272,8 +266,8 @@ public class EnumerationEditPart extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java index 4c98ba1ed5c..28284d777f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -32,9 +29,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -42,11 +38,9 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPo import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.EnumerationItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -270,8 +264,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java index b9e31186dc0..a573e03d542 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java index b3bbb29a596..84da23c603d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java index 1234c8a2dfc..752463771a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationLiteralEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -81,7 +79,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java index 297b1ecfd5a..1025afa5182 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implemen * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java index 0f717050b42..9cfe65c1833 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implem * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java index 55aa9fa7ec0..186e6d39be3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ExtensionEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java index 334853310b0..09ef4c1a11c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationAppliedStereotypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java index 407eee37d78..200e743ef8b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/GeneralizationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java index d24a5d58c12..f5e57f34cf4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.gef.EditPart; @@ -30,19 +27,16 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -256,8 +250,8 @@ public class MetaclassEditPart extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java index cfa78eaeae8..ac429e4f730 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.gef.EditPart; @@ -30,19 +27,16 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomMetaclassItemSemanticEditPolicyCN; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.MetaclassItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -256,8 +250,8 @@ public class MetaclassEditPartCN extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java index 63eed10bf85..6d6ed717975 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java index c3445789a17..db57f22204d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java index 48ee62c2b3e..e45c2eca573 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,9 +26,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -39,10 +35,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorder import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -264,8 +258,8 @@ public class ModelEditPartCN extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java index e1d2f55f23e..10009a897c7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,9 +26,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -39,10 +35,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorder import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ModelItemSemanticEditPolicyTN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -264,8 +258,8 @@ public class ModelEditPartTN extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java index 0406815db38..9469c97b124 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java index 8bf8ae0db12..ad74d9b42d4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java index c4f8913b12d..a5478824733 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java index fa0c1f40bae..a2f3849baf1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelPackageableElementCompartmentEditPartTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java index 8cd212aa799..6fdbca2b13b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MultiDependencyLabelEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java index 4f345a47a43..0a612e4d496 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,9 +26,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -39,10 +35,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorder import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackageItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -264,8 +258,8 @@ public class PackageEditPart extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java index 637b54831e5..2b99b630a4a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -30,9 +27,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -41,10 +37,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPo import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PackageItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -268,8 +262,8 @@ public class PackageEditPartCN extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java index 8c9085a8504..53bf809e106 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportAppliedStereotypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java index 5d8c295c200..f6625129e69 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageImportEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java index ffef0cbe88f..b5d7f6ef772 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class PackageNameEditPart extends PapyrusCompartmentEditPart implements I * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java index 586a0bb3702..2f47d147050 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java index 8225d880562..59963c37e41 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java index 98b0207075e..69e549994ef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackagePackageableElementCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java index 72f6d2700bf..89cd97e3233 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,19 +26,16 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -248,8 +242,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java index 5caa875a776..4b23f9af0f9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,19 +26,16 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomPrimitiveTypeItemSemanticEditPolicyCN; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -248,8 +242,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java index fc92b7e8b1c..749c14b47fa 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -62,7 +60,6 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper; import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; @@ -608,7 +605,7 @@ public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implem * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java index 0eae6d1c23f..2c01739e767 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -62,7 +60,6 @@ import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper; import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; @@ -608,7 +605,7 @@ public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart impl * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java index 23a1a1dc1b3..75c88b5badb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileApplicationEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java index 9f36f7316d3..55981647b4d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java index c0b51459c08..40517f77423 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,9 +26,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -39,10 +35,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorder import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -264,8 +258,8 @@ public class ProfileEditPartCN extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java index d39a6930296..44a6859a617 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; @@ -29,9 +26,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy; @@ -39,10 +35,8 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorder import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ProfileFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ProfileItemSemanticEditPolicyTN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -264,8 +258,8 @@ public class ProfileEditPartTN extends NamedElementEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java index bfe120a2b6d..26acd0a37d5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class ProfileNameEditPartCN extends PapyrusCompartmentEditPart implements * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java index b4f165a9cb3..a7cbcf2a577 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileNameEditPartTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class ProfileNameEditPartTN extends PapyrusCompartmentEditPart implements * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java index 970450ebeed..f8645fd6389 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java index 03f39ce72a4..585b9f49465 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfilePackageableElementCompartmentEditPartTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java index 69353c7f897..6bae0aff9e5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -18,7 +16,6 @@ import java.util.List; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.StackLayout; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.emf.common.notify.Notification; import org.eclipse.gef.EditPart; @@ -39,17 +36,14 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.ShortCutDiagramItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.graphics.Color; @@ -240,8 +234,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java index db3bf16ecdf..9538a00b5dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java index 512580eb161..8e4345bb07b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeAttributeCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java index b542bcdee42..7f5f4999935 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.gef.EditPart; @@ -33,9 +30,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy; @@ -43,12 +39,10 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayE import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicy; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -294,8 +288,8 @@ public class StereotypeEditPart extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java index ce1142beb52..6977a02dc6c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,14 +7,11 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.StackLayout; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.gef.EditPart; @@ -33,9 +30,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure; import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure; import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure; import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure; -import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper; import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy; @@ -43,12 +39,10 @@ import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayE import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy; import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy; import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure; -import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.custom.figure.StereotypeFigure; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomStereotypeItemSemanticEditPolicyCN; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.StereotypeItemSemanticEditPolicyCN; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; import org.eclipse.swt.graphics.Color; @@ -294,8 +288,8 @@ public class StereotypeEditPartCN extends ClassifierEditPart { * @generated */ protected void setLineType(int style) { - if(primaryShape instanceof NodeFigure) { - ((NodeFigure)primaryShape).setLineStyle(style); + if(primaryShape instanceof IPapyrusNodeFigure) { + ((IPapyrusNodeFigure)primaryShape).setLineStyle(style); } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java index f19d066cf02..a7de5ff8a04 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class StereotypeNameEditPart extends PapyrusCompartmentEditPart implement * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java index 518b874f996..b03307db760 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeNameEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; @@ -593,7 +591,7 @@ public class StereotypeNameEditPartCN extends PapyrusCompartmentEditPart impleme * @generated */ private View getFontStyleOwnerView() { - return (View)getModel(); + return getPrimaryView(); } /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java index 33ca2464088..b98ccb2ce5b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPart.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java index b6a9cbb6fcf..bc4e8168c83 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeOperationCompartmentEditPartCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java index 33d2fdafeef..bb2f220ffbe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/UMLEditPartFactory.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java index f11f46670ea..c9143ab9281 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationBranchItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java index efa62ed52d1..d5ef6aacf4a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java index 1f41c5400dc..93c58c201a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/AssociationNodeItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java index 9c1604ec0b2..786a39fc375 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassOperationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java index fc69483d018..f74651a733a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ClassPropertyItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java index dd2cc469ad0..92fdba5ed19 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java index fbd51f27f3c..9dbede4ba68 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentEditPartItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java index 62e89ad14bf..dff42a4b237 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/CommentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java index 1377ef10c62..3be7382fa43 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java index 93b2b30cac1..c7b1ea20192 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java index 882cea3fb3f..55350428452 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ConstraintItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ContextLinkItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ContextLinkItemSemanticEditPolicy.java index 29617e158cf..08dfd605ca6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ContextLinkItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ContextLinkItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java index eda7ec86ca8..bcca89b9704 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypePropertyCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java index 84746dd3ce0..9257dd280b4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypePropertyCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java index 42a7af45613..8550760e646 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java index fc0238e16de..04ef42c3803 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java index ae875a4c543..cd7d7321223 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeOperationCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java index cff9529ccf5..2f405a33051 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.DataTypeOperationCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java index 908d768da76..0a1f9fce184 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypeOperationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java index e2428a79b18..b8808f5cd11 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DataTypePropertyItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java index d68f165520a..da06997d32c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyBranchItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java index ae504815e36..93d5b5fa8f0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java index 8488ea28068..067a23e2886 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/DependencyNodeItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java index 69436a4fb2a..17fcc2999e6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ElementImportItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java index 0da4caeecb4..be830cb3983 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationLiteralCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java index 215791a5737..ec5dbbc91e8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.EnumerationLiteralCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java index e8fb4f5572e..efe8a5e2130 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java index 23f4d8df53c..8d3be9ee7dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java index c3b8a3b254e..51625fa3f18 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/EnumerationLiteralItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java index 286cc77efbe..7eaae1d22d7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ExtensionItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java index 17ab3705cff..8aba8c53b53 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/GeneralizationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java index 8c15c0575dc..571c3510622 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java index 011f900d96b..8ec48771c38 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/MetaclassItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java index c08eb53255b..d762ffdc24d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java index ca7e33c9a82..12c7b7b74cf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelItemSemanticEditPolicyTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java index 4fa2833a1a5..8da25911737 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java index 6098f2185ec..57b68146b0a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ModelPackageableElementCompartmentItemSemanticEditPolicyTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java index 0cceb2f2d92..b0b5e4558c6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageImportItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java index 8a45f4f940e..530b5a1a789 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java index 7c3780648ee..c658531b25c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackageItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java index f982a35d310..51a387655c3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java index 09ae126a4b2..56e9b7b07dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PackagePackageableElementCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java index 43f70473a8d..488090cf469 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java index 0681ababcae..73e2f09a074 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java index f35202934bb..e2eb31a9d1e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileApplicationItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java index 1db1a600d23..d9e4e5b761f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileDiagramItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; @@ -20,8 +18,6 @@ import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsComma import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.AssociationNodeCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommand; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java index ec84e1582ea..54181d89882 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java index b5d96f7491b..8ce3ed9b067 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfileItemSemanticEditPolicyTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java index cf9eff6be3e..0b1df3dd5e4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java index c4875d4d881..98582974f03 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ProfilePackageableElementCompartmentItemSemanticEditPolicyTN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassCreateCommandCN; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.CommentCreateCommandCN; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java index d9e1a684cc2..1fd1e4186b9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/ShortCutDiagramItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java index ea9fe30e3c5..8b86ad5ffbc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassPropertyCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java index 3c74db6304a..d2c821d56b8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeAttributeCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassPropertyCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java index 41dbacc7c9d..d74aee3ed13 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java index 95886b8f4c0..84b64fc1a51 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java index c8ff839d32b..ff2e0ce8016 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassOperationCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java index c3954857edd..cc714d506f7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/StereotypeOperationCompartmentItemSemanticEditPolicyCN.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,17 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.emf.type.core.IElementType; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; -import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType; -import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.uml.diagram.profile.edit.commands.ClassOperationCreateCommand; import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java index 2e210206f9a..34cc1872dd2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java index 092403465d1..472ae19ad2e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextNonResizableEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java index c43584305db..8b57c4c4d6c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLTextSelectionEditPolicy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.edit.policies; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java index 2ff0f5305b7..1620739e9ce 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLAbstractNavigatorItem.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java index 8f54771183c..38830dba845 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorContentProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java index 43dd86abed1..37a181d2ee5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorItem.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java index 977209bdc9b..1b03a61eed8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLDomainNavigatorLabelProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java index 7ca26450347..daa90aaee45 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorActionProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java index d58c08ea778..f8298b6d4ee 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorContentProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java index 82f577e15be..96ddf171cde 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorGroup.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java index e40ae84ce6d..bc307fc03c6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorItem.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java index 1ea9afe7dc7..97ecf01dc48 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLabelProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java index cd0e589f8e9..402ce69cec1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorLinkHelper.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; @@ -23,12 +21,10 @@ import org.eclipse.emf.workspace.util.WorkspaceSynchronizer; import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalViewer; import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor; -import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java index 326a7af387d..c5314574680 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/navigator/UMLNavigatorSorter.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.navigator; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java index 2e0d5c6275a..f3164dfd481 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/parsers/MessageFormatParser.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.parsers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java index 4f54b81a24e..2c712183257 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/DiagramEditorContextMenuProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java index 11dd7faa8ea..34693d2720d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/LoadResourceAction.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java index 26720741e5a..67eecf9c120 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/Messages.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -276,62 +274,62 @@ public class Messages extends NLS { /** * @generated */ - public static String Package1CreationTool_title; + public static String Class6CreationTool_title; /** * @generated */ - public static String Package1CreationTool_desc; + public static String Class6CreationTool_desc; /** * @generated */ - public static String Profile2CreationTool_title; + public static String Comment2CreationTool_title; /** * @generated */ - public static String Profile2CreationTool_desc; + public static String Comment2CreationTool_desc; /** * @generated */ - public static String Comment3CreationTool_title; + public static String Constraint3CreationTool_title; /** * @generated */ - public static String Comment3CreationTool_desc; + public static String Constraint3CreationTool_desc; /** * @generated */ - public static String Constraint4CreationTool_title; + public static String DataType4CreationTool_title; /** * @generated */ - public static String Constraint4CreationTool_desc; + public static String DataType4CreationTool_desc; /** * @generated */ - public static String Stereotype5CreationTool_title; + public static String Enumeration5CreationTool_title; /** * @generated */ - public static String Stereotype5CreationTool_desc; + public static String Enumeration5CreationTool_desc; /** * @generated */ - public static String Class6CreationTool_title; + public static String EnumerationLiteral6CreationTool_title; /** * @generated */ - public static String Class6CreationTool_desc; + public static String EnumerationLiteral6CreationTool_desc; /** * @generated @@ -346,122 +344,122 @@ public class Messages extends NLS { /** * @generated */ - public static String Enumeration8CreationTool_title; + public static String Operation8CreationTool_title; /** * @generated */ - public static String Enumeration8CreationTool_desc; + public static String Operation8CreationTool_desc; /** * @generated */ - public static String DataType9CreationTool_title; + public static String Package9CreationTool_title; /** * @generated */ - public static String DataType9CreationTool_desc; + public static String Package9CreationTool_desc; /** * @generated */ - public static String PrimitiveType10CreationTool_title; + public static String Profile10CreationTool_title; /** * @generated */ - public static String PrimitiveType10CreationTool_desc; + public static String Profile10CreationTool_desc; /** * @generated */ - public static String Property11CreationTool_title; + public static String PrimitiveType11CreationTool_title; /** * @generated */ - public static String Property11CreationTool_desc; + public static String PrimitiveType11CreationTool_desc; /** * @generated */ - public static String Operation12CreationTool_title; + public static String Property12CreationTool_title; /** * @generated */ - public static String Operation12CreationTool_desc; + public static String Property12CreationTool_desc; /** * @generated */ - public static String EnumerationLiteral13CreationTool_title; + public static String Stereotype13CreationTool_title; /** * @generated */ - public static String EnumerationLiteral13CreationTool_desc; + public static String Stereotype13CreationTool_desc; /** * @generated */ - public static String Extension1CreationTool_title; + public static String Association1CreationTool_title; /** * @generated */ - public static String Extension1CreationTool_desc; + public static String Association1CreationTool_desc; /** * @generated */ - public static String Generalization2CreationTool_title; + public static String ContextLink6CreationTool_title; /** * @generated */ - public static String Generalization2CreationTool_desc; + public static String ContextLink6CreationTool_desc; /** * @generated */ - public static String Link3CreationTool_title; + public static String Extension3CreationTool_title; /** * @generated */ - public static String Link3CreationTool_desc; + public static String Extension3CreationTool_desc; /** * @generated */ - public static String ProfileApplication4CreationTool_title; + public static String Generalization4CreationTool_title; /** * @generated */ - public static String ProfileApplication4CreationTool_desc; + public static String Generalization4CreationTool_desc; /** * @generated */ - public static String Association5CreationTool_title; + public static String Link5CreationTool_title; /** * @generated */ - public static String Association5CreationTool_desc; + public static String Link5CreationTool_desc; /** * @generated */ - public static String ContextLink6CreationTool_title; + public static String ProfileApplication6CreationTool_title; /** * @generated */ - public static String ContextLink6CreationTool_desc; + public static String ProfileApplication6CreationTool_desc; /** * @generated diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java index 836771ca611..f2123cc1ec6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ModelElementSelectionPage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java index 34aaafa6da7..9a1a920e66e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizard.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java index a3015f2c660..909e42359a8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLCreationWizardPage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java index 548f1dde5d0..eeb93e47d7b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramActionBarContributor.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java index b8f7906f3a0..7777b671d03 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramContentInitializer.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -122,7 +120,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createProfile_1000Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getProfile_1000SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfile_1000SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -133,7 +131,7 @@ public class UMLDiagramContentInitializer { */ private void createDependency_2014Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getDependency_2014OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_2014OutgoingLinks(view)); } /** @@ -141,7 +139,7 @@ public class UMLDiagramContentInitializer { */ private void createAssociation_2015Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getAssociation_2015OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_2015OutgoingLinks(view)); } /** @@ -149,7 +147,7 @@ public class UMLDiagramContentInitializer { */ private void createStereotype_1026Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getStereotype_1026OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_1026OutgoingLinks(view)); createStereotypeAttributes_1071Children(getCompartment(view, StereotypeAttributeCompartmentEditPart.VISUAL_ID)); createStereotypeOperations_1019Children(getCompartment(view, StereotypeOperationCompartmentEditPart.VISUAL_ID)); } @@ -159,7 +157,7 @@ public class UMLDiagramContentInitializer { */ private void createClass_2008Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_2008OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_2008OutgoingLinks(view)); createClassOperations_7018Children(getCompartment(view, ClassOperationCompartmentEditPart.VISUAL_ID)); createClassAttributes_7017Children(getCompartment(view, ClassAttributeCompartmentEditPart.VISUAL_ID)); } @@ -169,7 +167,7 @@ public class UMLDiagramContentInitializer { */ private void createClass_1031Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_1031OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_1031OutgoingLinks(view)); } /** @@ -177,7 +175,7 @@ public class UMLDiagramContentInitializer { */ private void createComment_1002Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getComment_1002OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_1002OutgoingLinks(view)); } /** @@ -185,7 +183,7 @@ public class UMLDiagramContentInitializer { */ private void createConstraint_1014Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getConstraint_1014OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_1014OutgoingLinks(view)); } /** @@ -193,7 +191,7 @@ public class UMLDiagramContentInitializer { */ private void createModel_2005Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getModel_2005OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_2005OutgoingLinks(view)); createModelPackagedelements_1057Children(getCompartment(view, ModelPackageableElementCompartmentEditPartTN.VISUAL_ID)); } @@ -202,7 +200,7 @@ public class UMLDiagramContentInitializer { */ private void createProfile_1030Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getProfile_1030OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_1030OutgoingLinks(view)); createProfilePackagedelements_1042Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartTN.VISUAL_ID)); } @@ -211,7 +209,7 @@ public class UMLDiagramContentInitializer { */ private void createPackage_2007Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getPackage_2007OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackage_2007OutgoingLinks(view)); createPackagePackagedelements_1005Children(getCompartment(view, PackagePackageableElementCompartmentEditPart.VISUAL_ID)); } @@ -220,7 +218,7 @@ public class UMLDiagramContentInitializer { */ private void createEnumeration_2006Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_2006OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_2006OutgoingLinks(view)); createEnumerationLiterals_1063Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID)); } @@ -229,7 +227,7 @@ public class UMLDiagramContentInitializer { */ private void createPrimitiveType_2009Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getPrimitiveType_2009OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_2009OutgoingLinks(view)); } /** @@ -237,7 +235,7 @@ public class UMLDiagramContentInitializer { */ private void createDataType_2010Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_2010OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_2010OutgoingLinks(view)); createDataTypeAttributes_1067Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID)); createDataTypeOperations_1068Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID)); } @@ -247,7 +245,7 @@ public class UMLDiagramContentInitializer { */ private void createDiagram_2016Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getDiagram_2016OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDiagram_2016OutgoingLinks(view)); } /** @@ -255,7 +253,7 @@ public class UMLDiagramContentInitializer { */ private void createPrimitiveType_3026Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getPrimitiveType_3026OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_3026OutgoingLinks(view)); } /** @@ -263,7 +261,7 @@ public class UMLDiagramContentInitializer { */ private void createOperation_3019Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getOperation_3019OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3019OutgoingLinks(view)); } /** @@ -271,7 +269,7 @@ public class UMLDiagramContentInitializer { */ private void createEnumerationLiteral_1037Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumerationLiteral_1037OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_1037OutgoingLinks(view)); } /** @@ -279,7 +277,7 @@ public class UMLDiagramContentInitializer { */ private void createProperty_3018Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getProperty_3018OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3018OutgoingLinks(view)); } /** @@ -287,7 +285,7 @@ public class UMLDiagramContentInitializer { */ private void createProperty_3002Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getProperty_3002OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3002OutgoingLinks(view)); } /** @@ -295,7 +293,7 @@ public class UMLDiagramContentInitializer { */ private void createOperation_3020Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getOperation_3020OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3020OutgoingLinks(view)); } /** @@ -303,7 +301,7 @@ public class UMLDiagramContentInitializer { */ private void createStereotype_1023Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getStereotype_1023OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStereotype_1023OutgoingLinks(view)); createStereotypeAttributes_1052Children(getCompartment(view, StereotypeAttributeCompartmentEditPartCN.VISUAL_ID)); createStereotypeOperations_1053Children(getCompartment(view, StereotypeOperationCompartmentEditPartCN.VISUAL_ID)); } @@ -313,7 +311,7 @@ public class UMLDiagramContentInitializer { */ private void createClass_3010Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_3010OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3010OutgoingLinks(view)); createClassAttributes_7011Children(getCompartment(view, ClassAttributeCompartmentEditPartCN.VISUAL_ID)); createClassOperations_7012Children(getCompartment(view, ClassOperationCompartmentEditPartCN.VISUAL_ID)); } @@ -323,7 +321,7 @@ public class UMLDiagramContentInitializer { */ private void createClass_3028Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_3028OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3028OutgoingLinks(view)); } /** @@ -331,7 +329,7 @@ public class UMLDiagramContentInitializer { */ private void createComment_1007Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getComment_1007OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_1007OutgoingLinks(view)); } /** @@ -339,7 +337,7 @@ public class UMLDiagramContentInitializer { */ private void createModel_1027Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getModel_1027OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getModel_1027OutgoingLinks(view)); createModelPackagedelements_1058Children(getCompartment(view, ModelPackageableElementCompartmentEditPartCN.VISUAL_ID)); } @@ -348,7 +346,7 @@ public class UMLDiagramContentInitializer { */ private void createProfile_1024Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getProfile_1024OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfile_1024OutgoingLinks(view)); createProfilePackagedelements_1051Children(getCompartment(view, ProfilePackageableElementCompartmentEditPartCN.VISUAL_ID)); } @@ -357,8 +355,8 @@ public class UMLDiagramContentInitializer { */ private void createPackage_1012Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getPackage_1012OutgoingLinks(view)); - Collection childNodeDescriptors = UMLDiagramUpdater.getPackage_1012SemanticChildren(view); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackage_1012OutgoingLinks(view)); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackage_1012SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -370,7 +368,7 @@ public class UMLDiagramContentInitializer { */ private void createConstraint_1028Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getConstraint_1028OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_1028OutgoingLinks(view)); } /** @@ -378,7 +376,7 @@ public class UMLDiagramContentInitializer { */ private void createEnumeration_3025Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_3025OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_3025OutgoingLinks(view)); createEnumerationLiterals_1062Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID)); } @@ -387,7 +385,7 @@ public class UMLDiagramContentInitializer { */ private void createDataType_3027Children(View view) { myDomain2NotationMap.put(view.getElement(), view); - myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_3027OutgoingLinks(view)); + myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_3027OutgoingLinks(view)); createDataTypeAttributes_1069Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID)); createDataTypeOperations_1070Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID)); } @@ -396,7 +394,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createPackagePackagedelements_1005Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackagedelements_1005SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackagePackagedelements_1005SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -406,7 +404,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createPackagePackagedelements_11Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getPackagePackagedelements_11SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackagePackagedelements_11SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -416,7 +414,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createProfilePackagedelements_1042Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getProfilePackagedelements_1042SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfilePackagedelements_1042SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -426,7 +424,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createProfilePackagedelements_1051Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getProfilePackagedelements_1051SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProfilePackagedelements_1051SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -436,7 +434,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createStereotypeAttributes_1071Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributes_1071SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeAttributes_1071SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -446,7 +444,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createStereotypeAttributes_1052Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeAttributes_1052SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeAttributes_1052SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -456,7 +454,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createStereotypeOperations_1019Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperations_1019SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeOperations_1019SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -466,7 +464,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createStereotypeOperations_1053Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getStereotypeOperations_1053SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStereotypeOperations_1053SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -476,7 +474,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createModelPackagedelements_1057Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getModelPackagedelements_1057SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getModelPackagedelements_1057SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -486,7 +484,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createModelPackagedelements_1058Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getModelPackagedelements_1058SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getModelPackagedelements_1058SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -496,7 +494,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createEnumerationLiterals_1062Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_1062SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_1062SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -506,7 +504,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createEnumerationLiterals_1063Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_1063SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_1063SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -516,7 +514,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createDataTypeAttributes_1067Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_1067SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_1067SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -526,7 +524,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createDataTypeAttributes_1069Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_1069SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_1069SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -536,7 +534,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createDataTypeOperations_1068Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_1068SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_1068SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -546,7 +544,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createDataTypeOperations_1070Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_1070SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_1070SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -556,7 +554,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createClassAttributes_7017Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getClassAttributes_7017SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassAttributes_7017SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -566,7 +564,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createClassAttributes_7011Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getClassAttributes_7011SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassAttributes_7011SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -576,7 +574,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createClassOperations_7018Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getClassOperations_7018SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassOperations_7018SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -586,7 +584,7 @@ public class UMLDiagramContentInitializer { * @generated */ private void createClassOperations_7012Children(View view) { - Collection childNodeDescriptors = UMLDiagramUpdater.getClassOperations_7012SemanticChildren(view); + Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassOperations_7012SemanticChildren(view); for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) { createNode(view, (UMLNodeDescriptor)it.next()); } @@ -716,31 +714,31 @@ public class UMLDiagramContentInitializer { continueLinkCreation = true; switch(nextLinkDescriptor.getVisualID()) { case ExtensionEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getExtension_1013OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExtension_1013OutgoingLinks(edge)); break; case AssociationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getAssociation_4001OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_4001OutgoingLinks(edge)); break; case ProfileApplicationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getProfileApplication_1045OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProfileApplication_1045OutgoingLinks(edge)); break; case AssociationBranchEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getAssociation_4019OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAssociation_4019OutgoingLinks(edge)); break; case GeneralizationEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getGeneralization_4002OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_4002OutgoingLinks(edge)); break; case DependencyEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getDependency_4008OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4008OutgoingLinks(edge)); break; case DependencyBranchEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getDependency_4018OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4018OutgoingLinks(edge)); break; case ElementImportEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getElementImport_1064OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getElementImport_1064OutgoingLinks(edge)); break; case PackageImportEditPart.VISUAL_ID: - additionalDescriptors.addAll(UMLDiagramUpdater.getPackageImport_1065OutgoingLinks(edge)); + additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPackageImport_1065OutgoingLinks(edge)); break; } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java index 058ff3b924c..a6cf49fd0b5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -33,7 +31,6 @@ import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds; import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener; -import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument; import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.util.LocalSelectionTransfer; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java index b289fbd673c..9a39633a61b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -17,10 +15,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; @@ -29,9 +25,9 @@ import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; -import org.eclipse.gmf.tooling.runtime.LogHelper; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.papyrus.infra.core.log.LogHelper; import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator; import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy; import org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer; @@ -98,6 +94,7 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { public void start(BundleContext context) throws Exception { super.start(context); instance = this; + myLogHelper = new LogHelper(this); PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore()); adapterFactory = createAdapterFactory(); DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer(); @@ -266,58 +263,34 @@ public class UMLDiagramEditorPlugin extends AbstractUIPlugin { * @generated */ public void logError(String error) { - logError(error, null); + getLogHelper().warn(error); } /** * @generated */ public void logError(String error, Throwable throwable) { - if (error == null && throwable != null) { - error = throwable.getMessage(); - } - getLog().log(new Status( - IStatus.ERROR, - UMLDiagramEditorPlugin.ID, - IStatus.OK, - error, throwable)); - debug(error, throwable); + getLogHelper().error(error, throwable); } /** * @generated */ public void logInfo(String message) { - logInfo(message, null); + getLogHelper().info(message); } /** * @generated */ public void logInfo(String message, Throwable throwable) { - if (message == null && throwable != null) { - message = throwable.getMessage(); - } - getLog().log(new Status( - IStatus.INFO, - UMLDiagramEditorPlugin.ID, - IStatus.OK, - message, throwable)); - debug(message, throwable); + getLogHelper().error(message, throwable); } /** * @generated */ - private void debug(String message, Throwable throwable) { - if (!isDebugging()) { - return; - } - if (message != null) { - System.err.println(message); - } - if (throwable != null) { - throwable.printStackTrace(); - } + public LogHelper getLogHelper() { + return myLogHelper; } -} \ No newline at end of file +} diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java index c17811dde1f..62adad4f393 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorUtil.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java index 27c03a9f41e..a77a543f7f3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdateCommand.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java index e27fe6b7d76..496ce019a62 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramUpdater.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -119,12 +117,24 @@ import org.eclipse.uml2.uml.UMLPackage; /** * @generated */ -public class UMLDiagramUpdater { +public class UMLDiagramUpdater implements DiagramUpdater { + + /** + * @generated + */ + public static final org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramUpdater INSTANCE = new UMLDiagramUpdater(); + + /** + * @generated + */ + protected UMLDiagramUpdater() { + //to prevent instantiation allowing the override + } /** * @generated */ - public static List getSemanticChildren(View view) { + public List getSemanticChildren(View view) { switch(UMLVisualIDRegistry.getVisualID(view)) { case ProfileDiagramEditPart.VISUAL_ID: return getProfile_1000SemanticChildren(view); @@ -177,7 +187,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1000SemanticChildren(View view) { + public List getProfile_1000SemanticChildren(View view) { if(!view.isSetElement()) { return Collections.emptyList(); } @@ -253,7 +263,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_1012SemanticChildren(View view) { + public List getPackage_1012SemanticChildren(View view) { if(!view.isSetElement()) { return Collections.emptyList(); } @@ -273,7 +283,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackagePackagedelements_1005SemanticChildren(View view) { + public List getPackagePackagedelements_1005SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -341,7 +351,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackagePackagedelements_11SemanticChildren(View view) { + public List getPackagePackagedelements_11SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -409,7 +419,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfilePackagedelements_1042SemanticChildren(View view) { + public List getProfilePackagedelements_1042SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -481,7 +491,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfilePackagedelements_1051SemanticChildren(View view) { + public List getProfilePackagedelements_1051SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -553,7 +563,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotypeAttributes_1071SemanticChildren(View view) { + public List getStereotypeAttributes_1071SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -577,7 +587,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotypeAttributes_1052SemanticChildren(View view) { + public List getStereotypeAttributes_1052SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -601,7 +611,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotypeOperations_1019SemanticChildren(View view) { + public List getStereotypeOperations_1019SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -625,7 +635,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotypeOperations_1053SemanticChildren(View view) { + public List getStereotypeOperations_1053SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -649,7 +659,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModelPackagedelements_1057SemanticChildren(View view) { + public List getModelPackagedelements_1057SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -709,7 +719,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModelPackagedelements_1058SemanticChildren(View view) { + public List getModelPackagedelements_1058SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -769,7 +779,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumerationLiterals_1062SemanticChildren(View view) { + public List getEnumerationLiterals_1062SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -793,7 +803,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumerationLiterals_1063SemanticChildren(View view) { + public List getEnumerationLiterals_1063SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -817,7 +827,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataTypeAttributes_1067SemanticChildren(View view) { + public List getDataTypeAttributes_1067SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -841,7 +851,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataTypeAttributes_1069SemanticChildren(View view) { + public List getDataTypeAttributes_1069SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -865,7 +875,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataTypeOperations_1068SemanticChildren(View view) { + public List getDataTypeOperations_1068SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -889,7 +899,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataTypeOperations_1070SemanticChildren(View view) { + public List getDataTypeOperations_1070SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -913,7 +923,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClassAttributes_7017SemanticChildren(View view) { + public List getClassAttributes_7017SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -937,7 +947,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClassAttributes_7011SemanticChildren(View view) { + public List getClassAttributes_7011SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -961,7 +971,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClassOperations_7018SemanticChildren(View view) { + public List getClassOperations_7018SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -985,7 +995,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClassOperations_7012SemanticChildren(View view) { + public List getClassOperations_7012SemanticChildren(View view) { if(false == view.eContainer() instanceof View) { return Collections.emptyList(); } @@ -1009,7 +1019,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getContainedLinks(View view) { + public List getContainedLinks(View view) { switch(UMLVisualIDRegistry.getVisualID(view)) { case ProfileDiagramEditPart.VISUAL_ID: return getProfile_1000ContainedLinks(view); @@ -1098,7 +1108,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getIncomingLinks(View view) { + public List getIncomingLinks(View view) { switch(UMLVisualIDRegistry.getVisualID(view)) { case DependencyNodeEditPart.VISUAL_ID: return getDependency_2014IncomingLinks(view); @@ -1185,7 +1195,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getOutgoingLinks(View view) { + public List getOutgoingLinks(View view) { switch(UMLVisualIDRegistry.getVisualID(view)) { case DependencyNodeEditPart.VISUAL_ID: return getDependency_2014OutgoingLinks(view); @@ -1272,7 +1282,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1000ContainedLinks(View view) { + public List getProfile_1000ContainedLinks(View view) { Profile modelElement = (Profile)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1289,14 +1299,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDependency_2014ContainedLinks(View view) { + public List getDependency_2014ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getAssociation_2015ContainedLinks(View view) { + public List getAssociation_2015ContainedLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1308,7 +1318,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotype_1026ContainedLinks(View view) { + public List getStereotype_1026ContainedLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1320,7 +1330,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_2008ContainedLinks(View view) { + public List getClass_2008ContainedLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1332,7 +1342,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_1031ContainedLinks(View view) { + public List getClass_1031ContainedLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1344,7 +1354,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1002ContainedLinks(View view) { + public List getComment_1002ContainedLinks(View view) { Comment modelElement = (Comment)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); @@ -1354,7 +1364,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1014ContainedLinks(View view) { + public List getConstraint_1014ContainedLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); @@ -1365,7 +1375,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_2005ContainedLinks(View view) { + public List getModel_2005ContainedLinks(View view) { Model modelElement = (Model)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1382,7 +1392,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1030ContainedLinks(View view) { + public List getProfile_1030ContainedLinks(View view) { Profile modelElement = (Profile)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1399,7 +1409,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_2007ContainedLinks(View view) { + public List getPackage_2007ContainedLinks(View view) { Package modelElement = (Package)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1416,7 +1426,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_2006ContainedLinks(View view) { + public List getEnumeration_2006ContainedLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1428,7 +1438,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPrimitiveType_2009ContainedLinks(View view) { + public List getPrimitiveType_2009ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1440,7 +1450,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_2010ContainedLinks(View view) { + public List getDataType_2010ContainedLinks(View view) { DataType modelElement = (DataType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1452,14 +1462,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDiagram_2016ContainedLinks(View view) { + public List getDiagram_2016ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getPrimitiveType_3026ContainedLinks(View view) { + public List getPrimitiveType_3026ContainedLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1471,7 +1481,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getOperation_3019ContainedLinks(View view) { + public List getOperation_3019ContainedLinks(View view) { Operation modelElement = (Operation)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); @@ -1482,28 +1492,28 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumerationLiteral_1037ContainedLinks(View view) { + public List getEnumerationLiteral_1037ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3018ContainedLinks(View view) { + public List getProperty_3018ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3002ContainedLinks(View view) { + public List getProperty_3002ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getOperation_3020ContainedLinks(View view) { + public List getOperation_3020ContainedLinks(View view) { Operation modelElement = (Operation)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_ElementImport_1064(modelElement)); @@ -1514,7 +1524,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotype_1023ContainedLinks(View view) { + public List getStereotype_1023ContainedLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1526,7 +1536,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3010ContainedLinks(View view) { + public List getClass_3010ContainedLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1538,7 +1548,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3028ContainedLinks(View view) { + public List getClass_3028ContainedLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1550,7 +1560,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1007ContainedLinks(View view) { + public List getComment_1007ContainedLinks(View view) { Comment modelElement = (Comment)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); @@ -1560,7 +1570,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_1027ContainedLinks(View view) { + public List getModel_1027ContainedLinks(View view) { Model modelElement = (Model)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1577,7 +1587,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1024ContainedLinks(View view) { + public List getProfile_1024ContainedLinks(View view) { Profile modelElement = (Profile)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1594,7 +1604,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_1012ContainedLinks(View view) { + public List getPackage_1012ContainedLinks(View view) { Package modelElement = (Package)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Extension_1013(modelElement)); @@ -1611,7 +1621,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1028ContainedLinks(View view) { + public List getConstraint_1028ContainedLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement)); @@ -1622,7 +1632,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_3025ContainedLinks(View view) { + public List getEnumeration_3025ContainedLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1634,7 +1644,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_3027ContainedLinks(View view) { + public List getDataType_3027ContainedLinks(View view) { DataType modelElement = (DataType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1646,7 +1656,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getExtension_1013ContainedLinks(View view) { + public List getExtension_1013ContainedLinks(View view) { Extension modelElement = (Extension)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1658,7 +1668,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_4001ContainedLinks(View view) { + public List getAssociation_4001ContainedLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1670,14 +1680,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfileApplication_1045ContainedLinks(View view) { + public List getProfileApplication_1045ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getAssociation_4019ContainedLinks(View view) { + public List getAssociation_4019ContainedLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getContainedTypeModelFacetLinks_Generalization_4002(modelElement)); @@ -1689,42 +1699,42 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getGeneralization_4002ContainedLinks(View view) { + public List getGeneralization_4002ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getDependency_4008ContainedLinks(View view) { + public List getDependency_4008ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getDependency_4018ContainedLinks(View view) { + public List getDependency_4018ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getElementImport_1064ContainedLinks(View view) { + public List getElementImport_1064ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getPackageImport_1065ContainedLinks(View view) { + public List getPackageImport_1065ContainedLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getDependency_2014IncomingLinks(View view) { + public List getDependency_2014IncomingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1739,7 +1749,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_2015IncomingLinks(View view) { + public List getAssociation_2015IncomingLinks(View view) { Association modelElement = (Association)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1758,7 +1768,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotype_1026IncomingLinks(View view) { + public List getStereotype_1026IncomingLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1778,7 +1788,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_2008IncomingLinks(View view) { + public List getClass_2008IncomingLinks(View view) { Class modelElement = (Class)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1798,7 +1808,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_1031IncomingLinks(View view) { + public List getClass_1031IncomingLinks(View view) { Class modelElement = (Class)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1818,7 +1828,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1002IncomingLinks(View view) { + public List getComment_1002IncomingLinks(View view) { Comment modelElement = (Comment)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1830,7 +1840,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1014IncomingLinks(View view) { + public List getConstraint_1014IncomingLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1845,7 +1855,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_2005IncomingLinks(View view) { + public List getModel_2005IncomingLinks(View view) { Model modelElement = (Model)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1862,7 +1872,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1030IncomingLinks(View view) { + public List getProfile_1030IncomingLinks(View view) { Profile modelElement = (Profile)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1880,7 +1890,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_2007IncomingLinks(View view) { + public List getPackage_2007IncomingLinks(View view) { Package modelElement = (Package)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1897,7 +1907,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_2006IncomingLinks(View view) { + public List getEnumeration_2006IncomingLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1916,7 +1926,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPrimitiveType_2009IncomingLinks(View view) { + public List getPrimitiveType_2009IncomingLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1935,7 +1945,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_2010IncomingLinks(View view) { + public List getDataType_2010IncomingLinks(View view) { DataType modelElement = (DataType)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1954,14 +1964,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDiagram_2016IncomingLinks(View view) { + public List getDiagram_2016IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getPrimitiveType_3026IncomingLinks(View view) { + public List getPrimitiveType_3026IncomingLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -1980,42 +1990,42 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getOperation_3019IncomingLinks(View view) { + public List getOperation_3019IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getEnumerationLiteral_1037IncomingLinks(View view) { + public List getEnumerationLiteral_1037IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3018IncomingLinks(View view) { + public List getProperty_3018IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3002IncomingLinks(View view) { + public List getProperty_3002IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getOperation_3020IncomingLinks(View view) { + public List getOperation_3020IncomingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getStereotype_1023IncomingLinks(View view) { + public List getStereotype_1023IncomingLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2035,7 +2045,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3010IncomingLinks(View view) { + public List getClass_3010IncomingLinks(View view) { Class modelElement = (Class)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2055,7 +2065,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3028IncomingLinks(View view) { + public List getClass_3028IncomingLinks(View view) { Class modelElement = (Class)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2075,7 +2085,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1007IncomingLinks(View view) { + public List getComment_1007IncomingLinks(View view) { Comment modelElement = (Comment)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2087,7 +2097,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_1027IncomingLinks(View view) { + public List getModel_1027IncomingLinks(View view) { Model modelElement = (Model)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2104,7 +2114,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1024IncomingLinks(View view) { + public List getProfile_1024IncomingLinks(View view) { Profile modelElement = (Profile)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2122,7 +2132,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_1012IncomingLinks(View view) { + public List getPackage_1012IncomingLinks(View view) { Package modelElement = (Package)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2139,7 +2149,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1028IncomingLinks(View view) { + public List getConstraint_1028IncomingLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2154,7 +2164,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_3025IncomingLinks(View view) { + public List getEnumeration_3025IncomingLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2173,7 +2183,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_3027IncomingLinks(View view) { + public List getDataType_3027IncomingLinks(View view) { DataType modelElement = (DataType)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2192,7 +2202,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getExtension_1013IncomingLinks(View view) { + public List getExtension_1013IncomingLinks(View view) { Extension modelElement = (Extension)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2211,7 +2221,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_4001IncomingLinks(View view) { + public List getAssociation_4001IncomingLinks(View view) { Association modelElement = (Association)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2230,7 +2240,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfileApplication_1045IncomingLinks(View view) { + public List getProfileApplication_1045IncomingLinks(View view) { ProfileApplication modelElement = (ProfileApplication)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2242,7 +2252,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_4019IncomingLinks(View view) { + public List getAssociation_4019IncomingLinks(View view) { Association modelElement = (Association)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2261,7 +2271,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getGeneralization_4002IncomingLinks(View view) { + public List getGeneralization_4002IncomingLinks(View view) { Generalization modelElement = (Generalization)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2273,7 +2283,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDependency_4008IncomingLinks(View view) { + public List getDependency_4008IncomingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2288,7 +2298,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDependency_4018IncomingLinks(View view) { + public List getDependency_4018IncomingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2303,7 +2313,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getElementImport_1064IncomingLinks(View view) { + public List getElementImport_1064IncomingLinks(View view) { ElementImport modelElement = (ElementImport)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2315,7 +2325,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackageImport_1065IncomingLinks(View view) { + public List getPackageImport_1065IncomingLinks(View view) { PackageImport modelElement = (PackageImport)view.getElement(); CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet()); LinkedList result = new LinkedList(); @@ -2327,7 +2337,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDependency_2014OutgoingLinks(View view) { + public List getDependency_2014OutgoingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); @@ -2338,7 +2348,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_2015OutgoingLinks(View view) { + public List getAssociation_2015OutgoingLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2354,7 +2364,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getStereotype_1026OutgoingLinks(View view) { + public List getStereotype_1026OutgoingLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2370,7 +2380,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_2008OutgoingLinks(View view) { + public List getClass_2008OutgoingLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2386,7 +2396,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_1031OutgoingLinks(View view) { + public List getClass_1031OutgoingLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2402,7 +2412,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1002OutgoingLinks(View view) { + public List getComment_1002OutgoingLinks(View view) { Comment modelElement = (Comment)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); @@ -2412,7 +2422,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1014OutgoingLinks(View view) { + public List getConstraint_1014OutgoingLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); @@ -2425,7 +2435,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_2005OutgoingLinks(View view) { + public List getModel_2005OutgoingLinks(View view) { Model modelElement = (Model)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2439,7 +2449,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1030OutgoingLinks(View view) { + public List getProfile_1030OutgoingLinks(View view) { Profile modelElement = (Profile)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2453,7 +2463,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_2007OutgoingLinks(View view) { + public List getPackage_2007OutgoingLinks(View view) { Package modelElement = (Package)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2467,7 +2477,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_2006OutgoingLinks(View view) { + public List getEnumeration_2006OutgoingLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2483,7 +2493,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPrimitiveType_2009OutgoingLinks(View view) { + public List getPrimitiveType_2009OutgoingLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2499,7 +2509,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_2010OutgoingLinks(View view) { + public List getDataType_2010OutgoingLinks(View view) { DataType modelElement = (DataType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2515,14 +2525,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDiagram_2016OutgoingLinks(View view) { + public List getDiagram_2016OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getPrimitiveType_3026OutgoingLinks(View view) { + public List getPrimitiveType_3026OutgoingLinks(View view) { PrimitiveType modelElement = (PrimitiveType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2538,42 +2548,42 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getOperation_3019OutgoingLinks(View view) { + public List getOperation_3019OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getEnumerationLiteral_1037OutgoingLinks(View view) { + public List getEnumerationLiteral_1037OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3018OutgoingLinks(View view) { + public List getProperty_3018OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getProperty_3002OutgoingLinks(View view) { + public List getProperty_3002OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getOperation_3020OutgoingLinks(View view) { + public List getOperation_3020OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getStereotype_1023OutgoingLinks(View view) { + public List getStereotype_1023OutgoingLinks(View view) { Stereotype modelElement = (Stereotype)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2589,7 +2599,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3010OutgoingLinks(View view) { + public List getClass_3010OutgoingLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2605,7 +2615,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getClass_3028OutgoingLinks(View view) { + public List getClass_3028OutgoingLinks(View view) { Class modelElement = (Class)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2621,7 +2631,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getComment_1007OutgoingLinks(View view) { + public List getComment_1007OutgoingLinks(View view) { Comment modelElement = (Comment)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(modelElement)); @@ -2631,7 +2641,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getModel_1027OutgoingLinks(View view) { + public List getModel_1027OutgoingLinks(View view) { Model modelElement = (Model)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2645,7 +2655,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfile_1024OutgoingLinks(View view) { + public List getProfile_1024OutgoingLinks(View view) { Profile modelElement = (Profile)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2659,7 +2669,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getPackage_1012OutgoingLinks(View view) { + public List getPackage_1012OutgoingLinks(View view) { Package modelElement = (Package)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_ProfileApplication_1045(modelElement)); @@ -2673,7 +2683,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getConstraint_1028OutgoingLinks(View view) { + public List getConstraint_1028OutgoingLinks(View view) { Constraint modelElement = (Constraint)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); @@ -2686,7 +2696,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getEnumeration_3025OutgoingLinks(View view) { + public List getEnumeration_3025OutgoingLinks(View view) { Enumeration modelElement = (Enumeration)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2702,7 +2712,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDataType_3027OutgoingLinks(View view) { + public List getDataType_3027OutgoingLinks(View view) { DataType modelElement = (DataType)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2718,7 +2728,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getExtension_1013OutgoingLinks(View view) { + public List getExtension_1013OutgoingLinks(View view) { Extension modelElement = (Extension)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2734,7 +2744,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getAssociation_4001OutgoingLinks(View view) { + public List getAssociation_4001OutgoingLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2750,14 +2760,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getProfileApplication_1045OutgoingLinks(View view) { + public List getProfileApplication_1045OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getAssociation_4019OutgoingLinks(View view) { + public List getAssociation_4019OutgoingLinks(View view) { Association modelElement = (Association)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Association_4001(modelElement)); @@ -2773,14 +2783,14 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getGeneralization_4002OutgoingLinks(View view) { + public List getGeneralization_4002OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getDependency_4008OutgoingLinks(View view) { + public List getDependency_4008OutgoingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); @@ -2791,7 +2801,7 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getDependency_4018OutgoingLinks(View view) { + public List getDependency_4018OutgoingLinks(View view) { Dependency modelElement = (Dependency)view.getElement(); LinkedList result = new LinkedList(); result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4008(modelElement)); @@ -2802,21 +2812,21 @@ public class UMLDiagramUpdater { /** * @generated */ - public static List getElementImport_1064OutgoingLinks(View view) { + public List getElementImport_1064OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - public static List getPackageImport_1065OutgoingLinks(View view) { + public List getPackageImport_1065OutgoingLinks(View view) { return Collections.emptyList(); } /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Extension_1013(Package container) { + protected Collection getContainedTypeModelFacetLinks_Extension_1013(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2842,7 +2852,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Association_4001(Package container) { + protected Collection getContainedTypeModelFacetLinks_Association_4001(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2873,7 +2883,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_ProfileApplication_1045(Package container) { + protected Collection getContainedTypeModelFacetLinks_ProfileApplication_1045(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getProfileApplications().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2894,7 +2904,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Association_4019(Package container) { + protected Collection getContainedTypeModelFacetLinks_Association_4019(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2925,7 +2935,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Generalization_4002(Classifier container) { + protected Collection getContainedTypeModelFacetLinks_Generalization_4002(Classifier container) { LinkedList result = new LinkedList(); for(Iterator links = container.getGeneralizations().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2945,7 +2955,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Dependency_4008(Package container) { + protected Collection getContainedTypeModelFacetLinks_Dependency_4008(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -2976,7 +2986,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_Dependency_4018(Package container) { + protected Collection getContainedTypeModelFacetLinks_Dependency_4018(Package container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -3007,7 +3017,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_ElementImport_1064(Namespace container) { + protected Collection getContainedTypeModelFacetLinks_ElementImport_1064(Namespace container) { LinkedList result = new LinkedList(); for(Iterator links = container.getElementImports().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -3028,7 +3038,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getContainedTypeModelFacetLinks_PackageImport_1065(Namespace container) { + protected Collection getContainedTypeModelFacetLinks_PackageImport_1065(Namespace container) { LinkedList result = new LinkedList(); for(Iterator links = container.getPackageImports().iterator(); links.hasNext();) { EObject linkObject = (EObject)links.next(); @@ -3049,7 +3059,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Extension_1013(Class target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Extension_1013(Class target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3074,7 +3084,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Association_4001(Type target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Association_4001(Type target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3099,7 +3109,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_ProfileApplication_1045(Profile target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_ProfileApplication_1045(Profile target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3119,7 +3129,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Association_4019(Type target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Association_4019(Type target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3144,7 +3154,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Generalization_4002(Classifier target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Generalization_4002(Classifier target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3167,7 +3177,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Dependency_4008(NamedElement target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Dependency_4008(NamedElement target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3192,7 +3202,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_Dependency_4018(NamedElement target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_Dependency_4018(NamedElement target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3217,7 +3227,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_ElementImport_1064(PackageableElement target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_ElementImport_1064(PackageableElement target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3237,7 +3247,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingTypeModelFacetLinks_PackageImport_1065(Package target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingTypeModelFacetLinks_PackageImport_1065(Package target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3257,7 +3267,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Element target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Element target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3271,7 +3281,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3285,7 +3295,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getIncomingFeatureModelFacetLinks_Constraint_Context_8500(Namespace target, CrossReferenceAdapter crossReferencer) { + protected Collection getIncomingFeatureModelFacetLinks_Constraint_Context_8500(Namespace target, CrossReferenceAdapter crossReferencer) { LinkedList result = new LinkedList(); Collection settings = crossReferencer.getInverseReferences(target); for(EStructuralFeature.Setting setting : settings) { @@ -3299,7 +3309,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_Association_4001(Type source) { + protected Collection getOutgoingTypeModelFacetLinks_Association_4001(Type source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3345,7 +3355,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_ProfileApplication_1045(Package source) { + protected Collection getOutgoingTypeModelFacetLinks_ProfileApplication_1045(Package source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3381,7 +3391,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_Association_4019(Type source) { + protected Collection getOutgoingTypeModelFacetLinks_Association_4019(Type source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3427,7 +3437,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_Dependency_4008(NamedElement source) { + protected Collection getOutgoingTypeModelFacetLinks_Dependency_4008(NamedElement source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3473,7 +3483,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_Dependency_4018(NamedElement source) { + protected Collection getOutgoingTypeModelFacetLinks_Dependency_4018(NamedElement source) { Package container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3519,7 +3529,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_ElementImport_1064(Namespace source) { + protected Collection getOutgoingTypeModelFacetLinks_ElementImport_1064(Namespace source) { Namespace container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3555,7 +3565,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingTypeModelFacetLinks_PackageImport_1065(Namespace source) { + protected Collection getOutgoingTypeModelFacetLinks_PackageImport_1065(Namespace source) { Namespace container = null; // Find container element for the link. // Climb up by containment hierarchy starting from the source @@ -3591,7 +3601,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Comment source) { + protected Collection getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_1022(Comment source) { LinkedList result = new LinkedList(); for(Iterator destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) { Element destination = (Element)destinations.next(); @@ -3603,7 +3613,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) { + protected Collection getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) { LinkedList result = new LinkedList(); for(Iterator destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) { Element destination = (Element)destinations.next(); @@ -3615,7 +3625,7 @@ public class UMLDiagramUpdater { /** * @generated */ - private static Collection getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(Constraint source) { + protected Collection getOutgoingFeatureModelFacetLinks_Constraint_Context_8500(Constraint source) { LinkedList result = new LinkedList(); Namespace destination = source.getContext(); if(destination == null) { @@ -3624,38 +3634,4 @@ public class UMLDiagramUpdater { result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintContext_8500, ContextLinkEditPart.VISUAL_ID)); return result; } - - /** - * @generated - */ - public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() { - - /** - * @generated - */ - public List getSemanticChildren(View view) { - return UMLDiagramUpdater.getSemanticChildren(view); - } - - /** - * @generated - */ - public List getContainedLinks(View view) { - return UMLDiagramUpdater.getContainedLinks(view); - } - - /** - * @generated - */ - public List getIncomingLinks(View view) { - return UMLDiagramUpdater.getIncomingLinks(view); - } - - /** - * @generated - */ - public List getOutgoingLinks(View view) { - return UMLDiagramUpdater.getOutgoingLinks(view); - } - }; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java index 87bb35c3a42..48f7c325265 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDocumentProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java index 5208338686c..d682c0c1e33 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLInitDiagramFileAction.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java index c44b651a22b..17b4917a1c8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLLinkDescriptor.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java index 88943a00002..718e269ccda 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLMatchingStrategy.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java index e87dc2e8c5b..a954a97e332 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNewDiagramFileWizard.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java index efbb87c9759..7e148d2b4b9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLNodeDescriptor.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java index 279c01fdaa2..9c526768356 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLPaletteFactory.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -34,32 +32,32 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private final static String CREATEPACKAGE1CREATIONTOOL = "createPackage1CreationTool";//$NON-NLS-1$ + private final static String CREATECLASS6CREATIONTOOL = "createClass6CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEPROFILE2CREATIONTOOL = "createProfile2CreationTool";//$NON-NLS-1$ + private final static String CREATECOMMENT2CREATIONTOOL = "createComment2CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATECOMMENT3CREATIONTOOL = "createComment3CreationTool";//$NON-NLS-1$ + private final static String CREATECONSTRAINT3CREATIONTOOL = "createConstraint3CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATECONSTRAINT4CREATIONTOOL = "createConstraint4CreationTool";//$NON-NLS-1$ + private final static String CREATEDATATYPE4CREATIONTOOL = "createDataType4CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATESTEREOTYPE5CREATIONTOOL = "createStereotype5CreationTool";//$NON-NLS-1$ + private final static String CREATEENUMERATION5CREATIONTOOL = "createEnumeration5CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATECLASS6CREATIONTOOL = "createClass6CreationTool";//$NON-NLS-1$ + private final static String CREATEENUMERATIONLITERAL6CREATIONTOOL = "createEnumerationLiteral6CreationTool";//$NON-NLS-1$ /** * @generated @@ -69,62 +67,62 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private final static String CREATEENUMERATION8CREATIONTOOL = "createEnumeration8CreationTool";//$NON-NLS-1$ + private final static String CREATEOPERATION8CREATIONTOOL = "createOperation8CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEDATATYPE9CREATIONTOOL = "createDataType9CreationTool";//$NON-NLS-1$ + private final static String CREATEPACKAGE9CREATIONTOOL = "createPackage9CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEPRIMITIVETYPE10CREATIONTOOL = "createPrimitiveType10CreationTool";//$NON-NLS-1$ + private final static String CREATEPROFILE10CREATIONTOOL = "createProfile10CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEPROPERTY11CREATIONTOOL = "createProperty11CreationTool";//$NON-NLS-1$ + private final static String CREATEPRIMITIVETYPE11CREATIONTOOL = "createPrimitiveType11CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEOPERATION12CREATIONTOOL = "createOperation12CreationTool";//$NON-NLS-1$ + private final static String CREATEPROPERTY12CREATIONTOOL = "createProperty12CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEENUMERATIONLITERAL13CREATIONTOOL = "createEnumerationLiteral13CreationTool";//$NON-NLS-1$ + private final static String CREATESTEREOTYPE13CREATIONTOOL = "createStereotype13CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEEXTENSION1CREATIONTOOL = "createExtension1CreationTool";//$NON-NLS-1$ + private final static String CREATEASSOCIATION1CREATIONTOOL = "createAssociation1CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEGENERALIZATION2CREATIONTOOL = "createGeneralization2CreationTool";//$NON-NLS-1$ + private final static String CREATECONTEXTLINK6CREATIONTOOL = "createContextLink6CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATELINK3CREATIONTOOL = "createLink3CreationTool";//$NON-NLS-1$ + private final static String CREATEEXTENSION3CREATIONTOOL = "createExtension3CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEPROFILEAPPLICATION4CREATIONTOOL = "createProfileApplication4CreationTool";//$NON-NLS-1$ + private final static String CREATEGENERALIZATION4CREATIONTOOL = "createGeneralization4CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATEASSOCIATION5CREATIONTOOL = "createAssociation5CreationTool";//$NON-NLS-1$ + private final static String CREATELINK5CREATIONTOOL = "createLink5CreationTool";//$NON-NLS-1$ /** * @generated */ - private final static String CREATECONTEXTLINK6CREATIONTOOL = "createContextLink6CreationTool";//$NON-NLS-1$ + private final static String CREATEPROFILEAPPLICATION6CREATIONTOOL = "createProfileApplication6CreationTool";//$NON-NLS-1$ /** * @generated @@ -136,62 +134,62 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { * @generated */ public Tool createTool(String toolId) { - if(toolId.equals(CREATEPACKAGE1CREATIONTOOL)) { - return createPackage1CreationTool(); + if(toolId.equals(CREATECLASS6CREATIONTOOL)) { + return createClass6CreationTool(); } - if(toolId.equals(CREATEPROFILE2CREATIONTOOL)) { - return createProfile2CreationTool(); + if(toolId.equals(CREATECOMMENT2CREATIONTOOL)) { + return createComment2CreationTool(); } - if(toolId.equals(CREATECOMMENT3CREATIONTOOL)) { - return createComment3CreationTool(); + if(toolId.equals(CREATECONSTRAINT3CREATIONTOOL)) { + return createConstraint3CreationTool(); } - if(toolId.equals(CREATECONSTRAINT4CREATIONTOOL)) { - return createConstraint4CreationTool(); + if(toolId.equals(CREATEDATATYPE4CREATIONTOOL)) { + return createDataType4CreationTool(); } - if(toolId.equals(CREATESTEREOTYPE5CREATIONTOOL)) { - return createStereotype5CreationTool(); + if(toolId.equals(CREATEENUMERATION5CREATIONTOOL)) { + return createEnumeration5CreationTool(); } - if(toolId.equals(CREATECLASS6CREATIONTOOL)) { - return createClass6CreationTool(); + if(toolId.equals(CREATEENUMERATIONLITERAL6CREATIONTOOL)) { + return createEnumerationLiteral6CreationTool(); } if(toolId.equals(CREATEIMPORTMETACLASS7CREATIONTOOL)) { return createImportMetaclass7CreationTool(); } - if(toolId.equals(CREATEENUMERATION8CREATIONTOOL)) { - return createEnumeration8CreationTool(); + if(toolId.equals(CREATEOPERATION8CREATIONTOOL)) { + return createOperation8CreationTool(); } - if(toolId.equals(CREATEDATATYPE9CREATIONTOOL)) { - return createDataType9CreationTool(); + if(toolId.equals(CREATEPACKAGE9CREATIONTOOL)) { + return createPackage9CreationTool(); } - if(toolId.equals(CREATEPRIMITIVETYPE10CREATIONTOOL)) { - return createPrimitiveType10CreationTool(); + if(toolId.equals(CREATEPROFILE10CREATIONTOOL)) { + return createProfile10CreationTool(); } - if(toolId.equals(CREATEPROPERTY11CREATIONTOOL)) { - return createProperty11CreationTool(); + if(toolId.equals(CREATEPRIMITIVETYPE11CREATIONTOOL)) { + return createPrimitiveType11CreationTool(); } - if(toolId.equals(CREATEOPERATION12CREATIONTOOL)) { - return createOperation12CreationTool(); + if(toolId.equals(CREATEPROPERTY12CREATIONTOOL)) { + return createProperty12CreationTool(); } - if(toolId.equals(CREATEENUMERATIONLITERAL13CREATIONTOOL)) { - return createEnumerationLiteral13CreationTool(); + if(toolId.equals(CREATESTEREOTYPE13CREATIONTOOL)) { + return createStereotype13CreationTool(); } - if(toolId.equals(CREATEEXTENSION1CREATIONTOOL)) { - return createExtension1CreationTool(); + if(toolId.equals(CREATEASSOCIATION1CREATIONTOOL)) { + return createAssociation1CreationTool(); } - if(toolId.equals(CREATEGENERALIZATION2CREATIONTOOL)) { - return createGeneralization2CreationTool(); + if(toolId.equals(CREATECONTEXTLINK6CREATIONTOOL)) { + return createContextLink6CreationTool(); } - if(toolId.equals(CREATELINK3CREATIONTOOL)) { - return createLink3CreationTool(); + if(toolId.equals(CREATEEXTENSION3CREATIONTOOL)) { + return createExtension3CreationTool(); } - if(toolId.equals(CREATEPROFILEAPPLICATION4CREATIONTOOL)) { - return createProfileApplication4CreationTool(); + if(toolId.equals(CREATEGENERALIZATION4CREATIONTOOL)) { + return createGeneralization4CreationTool(); } - if(toolId.equals(CREATEASSOCIATION5CREATIONTOOL)) { - return createAssociation5CreationTool(); + if(toolId.equals(CREATELINK5CREATIONTOOL)) { + return createLink5CreationTool(); } - if(toolId.equals(CREATECONTEXTLINK6CREATIONTOOL)) { - return createContextLink6CreationTool(); + if(toolId.equals(CREATEPROFILEAPPLICATION6CREATIONTOOL)) { + return createProfileApplication6CreationTool(); } // default return: null return null; @@ -208,10 +206,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createPackage1CreationTool() { + private Tool createClass6CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Package_2007); - types.add(UMLElementTypes.Package_1012); + types.add(UMLElementTypes.Class_3010); + types.add(UMLElementTypes.Class_2008); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -219,10 +217,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createProfile2CreationTool() { + private Tool createComment2CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Profile_1030); - types.add(UMLElementTypes.Profile_1024); + types.add(UMLElementTypes.Comment_1002); + types.add(UMLElementTypes.Comment_1007); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -230,10 +228,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createComment3CreationTool() { + private Tool createConstraint3CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Comment_1002); - types.add(UMLElementTypes.Comment_1007); + types.add(UMLElementTypes.Constraint_1014); + types.add(UMLElementTypes.Constraint_1028); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -241,10 +239,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createConstraint4CreationTool() { + private Tool createDataType4CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Constraint_1014); - types.add(UMLElementTypes.Constraint_1028); + types.add(UMLElementTypes.DataType_2010); + types.add(UMLElementTypes.DataType_3027); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -252,10 +250,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createStereotype5CreationTool() { + private Tool createEnumeration5CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Stereotype_1023); - types.add(UMLElementTypes.Stereotype_1026); + types.add(UMLElementTypes.Enumeration_2006); + types.add(UMLElementTypes.Enumeration_3025); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -263,10 +261,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createClass6CreationTool() { - List types = new ArrayList(2); - types.add(UMLElementTypes.Class_3010); - types.add(UMLElementTypes.Class_2008); + private Tool createEnumerationLiteral6CreationTool() { + List types = new ArrayList(1); + types.add(UMLElementTypes.EnumerationLiteral_1037); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -285,10 +282,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createEnumeration8CreationTool() { + private Tool createOperation8CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Enumeration_2006); - types.add(UMLElementTypes.Enumeration_3025); + types.add(UMLElementTypes.Operation_3019); + types.add(UMLElementTypes.Operation_3020); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -296,10 +293,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createDataType9CreationTool() { + private Tool createPackage9CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.DataType_2010); - types.add(UMLElementTypes.DataType_3027); + types.add(UMLElementTypes.Package_2007); + types.add(UMLElementTypes.Package_1012); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -307,10 +304,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createPrimitiveType10CreationTool() { + private Tool createProfile10CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.PrimitiveType_2009); - types.add(UMLElementTypes.PrimitiveType_3026); + types.add(UMLElementTypes.Profile_1030); + types.add(UMLElementTypes.Profile_1024); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -318,10 +315,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createProperty11CreationTool() { + private Tool createPrimitiveType11CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Property_3002); - types.add(UMLElementTypes.Property_3018); + types.add(UMLElementTypes.PrimitiveType_2009); + types.add(UMLElementTypes.PrimitiveType_3026); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -329,10 +326,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createOperation12CreationTool() { + private Tool createProperty12CreationTool() { List types = new ArrayList(2); - types.add(UMLElementTypes.Operation_3019); - types.add(UMLElementTypes.Operation_3020); + types.add(UMLElementTypes.Property_3002); + types.add(UMLElementTypes.Property_3018); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -340,9 +337,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createEnumerationLiteral13CreationTool() { - List types = new ArrayList(1); - types.add(UMLElementTypes.EnumerationLiteral_1037); + private Tool createStereotype13CreationTool() { + List types = new ArrayList(2); + types.add(UMLElementTypes.Stereotype_1023); + types.add(UMLElementTypes.Stereotype_1026); Tool tool = new AspectUnspecifiedTypeCreationTool(types); return tool; } @@ -350,9 +348,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createExtension1CreationTool() { + private Tool createAssociation1CreationTool() { List types = new ArrayList(1); - types.add(UMLElementTypes.Extension_1013); + types.add(UMLElementTypes.Association_4001); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -360,9 +358,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createGeneralization2CreationTool() { + private Tool createContextLink6CreationTool() { List types = new ArrayList(1); - types.add(UMLElementTypes.Generalization_4002); + types.add(UMLElementTypes.ConstraintContext_8500); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -370,10 +368,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createLink3CreationTool() { - List types = new ArrayList(2); - types.add(UMLElementTypes.CommentAnnotatedElement_1022); - types.add(UMLElementTypes.ConstraintConstrainedElement_4014); + private Tool createExtension3CreationTool() { + List types = new ArrayList(1); + types.add(UMLElementTypes.Extension_1013); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -381,9 +378,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createProfileApplication4CreationTool() { + private Tool createGeneralization4CreationTool() { List types = new ArrayList(1); - types.add(UMLElementTypes.ProfileApplication_1045); + types.add(UMLElementTypes.Generalization_4002); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -391,9 +388,10 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createAssociation5CreationTool() { - List types = new ArrayList(1); - types.add(UMLElementTypes.Association_4001); + private Tool createLink5CreationTool() { + List types = new ArrayList(2); + types.add(UMLElementTypes.CommentAnnotatedElement_1022); + types.add(UMLElementTypes.ConstraintConstrainedElement_4014); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } @@ -401,9 +399,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter { /** * @generated */ - private Tool createContextLink6CreationTool() { + private Tool createProfileApplication6CreationTool() { List types = new ArrayList(1); - types.add(UMLElementTypes.ConstraintContext_8500); + types.add(UMLElementTypes.ProfileApplication_1045); Tool tool = new AspectUnspecifiedTypeConnectionTool(types); return tool; } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java index ac59ee8cfcd..dcc67b2b53f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLUriEditorInputTester.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java index d4e0a3bd232..d1b621a7ed5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLVisualIDRegistry.java @@ -1,15 +1,13 @@ -/* +/** * Copyright (c) 2014 CEA LIST. - * + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; @@ -22,10 +20,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure; import org.eclipse.papyrus.uml.diagram.common.util.Util; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.*; -import org.eclipse.uml2.uml.Element; -import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Profile; -import org.eclipse.uml2.uml.Stereotype; import org.eclipse.uml2.uml.Type; import org.eclipse.uml2.uml.UMLPackage; @@ -33,7 +28,7 @@ import org.eclipse.uml2.uml.UMLPackage; * This registry is used to determine which type of visual object should be * created for the corresponding Diagram, Node, ChildNode or Link represented * by a domain model object. - * + * * @generated */ public class UMLVisualIDRegistry { @@ -65,7 +60,7 @@ public class UMLVisualIDRegistry { while(view != diagram) { EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$ if(annotation != null) { - return annotation.getDetails().get("modelID"); //$NON-NLS-1$ + return (String)annotation.getDetails().get("modelID"); //$NON-NLS-1$ } view = (View)view.eContainer(); } @@ -1059,7 +1054,7 @@ public class UMLVisualIDRegistry { /** * User can change implementation of this method to handle some specific * situations not covered by default logic. - * + * * @generated */ private static boolean isDiagram(Profile element) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java index 248915ad7d2..f29fe842007 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/ValidateAction.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.part; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java index d44408836b2..49d7707607a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramAppearancePreferencePage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java index d731b7f8ac1..6d9a44aa6db 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramConnectionsPreferencePage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java index 6eafb92b1a9..cd89131971d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java index ce263b55df9..1e9a65905f7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPreferenceInitializer.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java index a28ed764820..632c677fd70 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramPrintingPreferencePage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java index 87e6ec82042..d4cafbbd6ba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramRulersAndGridPreferencePage.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.preferences; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java index bddde53be59..10d68e3b84c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/ElementInitializers.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java index c83ae8d346c..badc94c519d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLEditPartProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java index 88aef624dc4..0f3261a187a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLElementTypes.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java index cdcac28418c..d889567fd14 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLIconProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java index 091253743f8..f180fc050df 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLMarkerNavigationProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java index 64e73b4312f..7987442def2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLParserProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java index e05c89cb8ea..289a9db2edf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationDecoratorProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java index 99d87b6323f..6cae51e9520 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLValidationProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java index e91706e7bee..866b20a2e6e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.providers; @@ -59,101 +57,6 @@ import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstants import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter; import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.*; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchMultiplicityEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationBranchRoleEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicitySourceEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationMultiplicityTargetEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleSourceEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationRoleTargetEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassOperationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ClassPropertyEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentAnnotatedElementEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentBodyEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintBodyEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintConstrainedElementEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ContextLinkEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeAttributeCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeOperationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypePropertyEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyAppliedStereotypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyBranchEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.DiagramNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportAliasEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ElementImportEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEnumerationLiteralCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationLiteralEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ExtensionEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationAppliedStereotypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.GeneralizationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelPackageableElementCompartmentEditPartTN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MultiDependencyLabelEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportAppliedStereotypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageImportEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackagePackageableElementCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileApplicationEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileNameEditPartTN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeAttributeCompartmentEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeNameEditPartCN; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPart; -import org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeOperationCompartmentEditPartCN; import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.FontData; @@ -247,9 +150,10 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider { visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint()); if(elementType != null) { if(elementType instanceof IExtendedHintedElementType) { - IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType); - if(!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) { - return false; // foreign element type. + if(domainElement != null) { + if(!UMLVisualIDRegistry.checkNodeVisualID(op.getContainerView(), domainElement, visualID)) { + return false; + } } } else { if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java index c33a5197ea4..dbb5eb5909d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLPropertySection.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.sheet; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java index b9b5ee0f2f7..a1a9eea2fc8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/sheet/UMLSheetLabelProvider.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014 CEA LIST. * * All rights reserved. This program and the accompanying materials @@ -7,9 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation - * - * + * CEA LIST - Initial API and implementation */ package org.eclipse.papyrus.uml.diagram.profile.sheet; -- cgit v1.2.3